svn commit: r311998 - stable/10/bin/ls/tests

[Alan Somers]

Author: asomers
Date: Thu Jan 12 21:46:31 2017
New Revision: 311998
URL: https://svnweb.freebsd.org/changeset/base/311998

Log:
  MFC r310118
  
  Fix ls_tests:o_flag with ZFS TMPDIR
  
  Unlike UFS or TMPFS, ZFS sets uarch automatically whenever a file is
  updated. The test must explicitly clear uarch to be portable across
  filesystems. Also, it doesn't need to run as root.

Modified:
  stable/10/bin/ls/tests/ls_tests.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/ls/tests/ls_tests.sh
==============================================================================
--- stable/10/bin/ls/tests/ls_tests.sh	Thu Jan 12 21:41:00 2017	(r311997)
+++ stable/10/bin/ls/tests/ls_tests.sh	Thu Jan 12 21:46:31 2017	(r311998)
@@ -689,7 +689,6 @@ atf_test_case o_flag
 o_flag_head()
 {
 	atf_set "descr" "Verify that the output from ls -o prints out the chflag values or '-' if none are set"
-	atf_set "require.user" "root"
 }
 
 o_flag_body()
@@ -703,6 +702,7 @@ o_flag_body()
 	atf_check -e ignore -o empty -s exit:0 dd if=/dev/zero of=b.file \
 	    bs=$size count=1
 	atf_check -e empty -o empty -s exit:0 chflags uarch a.file
+	atf_check -e empty -o empty -s exit:0 chflags 0 b.file
 
 	atf_check -e empty -o match:"[[:space:]]+uarch[[:space:]]$size+.+a\\.file" \
 	    -s exit:0 ls -lo a.file