diff options
| author | asomers <asomers@FreeBSD.org> | 2017-01-12 21:41:00 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2017-01-12 21:41:00 +0000 |
| commit | 4c2fab27f3a472481497ec0b20d6e2d2f4279116 (patch) | |
| tree | f3f970974c9b079801a44655087a52846dac9419 /bin | |
| parent | 9a557d572cf0ce8058fc6b40de443231f411cd00 (diff) | |
| download | FreeBSD-src-4c2fab27f3a472481497ec0b20d6e2d2f4279116.zip FreeBSD-src-4c2fab27f3a472481497ec0b20d6e2d2f4279116.tar.gz | |
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.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ls/tests/ls_tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ls/tests/ls_tests.sh b/bin/ls/tests/ls_tests.sh index 2291bab..e8817fe 100755 --- a/bin/ls/tests/ls_tests.sh +++ b/bin/ls/tests/ls_tests.sh @@ -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 |
