diff options
| author | gjb <gjb@FreeBSD.org> | 2017-08-24 13:39:24 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-08-24 13:39:24 +0000 |
| commit | f17920ba238cca41530107cf01fe8537dd56d609 (patch) | |
| tree | 1fd5e5a0587b3b5e2b9bbd209b3a074c370f1c42 | |
| parent | 98df8808f5f53ab0596c8ad510a8f4a83a1113ec (diff) | |
| download | FreeBSD-src-f17920ba238cca41530107cf01fe8537dd56d609.zip FreeBSD-src-f17920ba238cca41530107cf01fe8537dd56d609.tar.gz | |
MFC r322770, r322796:
r322770:
Apply changes from bin/chmod/tests/chmod_test.sh, adding
atf_expect_fail() before chflags(8) is invoked if the filesystem
is ZFS, which does not support UF_IMMUTABLE.
r322796:
Revert part of r322770 in usr.sbin/chown/tests/chown_test.sh,
which incorrectly adds atf_expect_fail() where there is no
failure case.
Approved by: re (marius)
Sponsored by: The FreeBSD Foundation
| -rwxr-xr-x | usr.sbin/chown/tests/chown_test.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.sbin/chown/tests/chown_test.sh b/usr.sbin/chown/tests/chown_test.sh index a5e55f9..b8b85ab 100755 --- a/usr.sbin/chown/tests/chown_test.sh +++ b/usr.sbin/chown/tests/chown_test.sh @@ -25,6 +25,13 @@ # # $FreeBSD$ +get_filesystem() +{ + local mountpoint=$1 + + df -T $mountpoint | tail -n 1 | cut -wf 2 +} + atf_test_case RH_flag RH_flag_head() { @@ -98,6 +105,11 @@ f_flag_body() { atf_check truncate -s 0 foo bar atf_check chown 0:0 foo bar + case "$(get_filesystem .)" in + zfs) + atf_expect_fail "ZFS does not support UF_IMMUTABLE; returns EPERM" + ;; + esac atf_check chflags uchg foo atf_check -e not-empty -s not-exit:0 chown 42:42 foo bar atf_check -o inline:'0:0\n42:42\n' stat -f '%u:%g' foo bar @@ -107,7 +119,7 @@ f_flag_body() f_flag_cleanup() { - atf_check chflags 0 foo + chflags 0 foo || : } atf_test_case h_flag |
