From 30c871cb0a4f60ec71dccd9f86b1276f1ec444e5 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 24 Aug 2017 13:39:24 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@322835 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/chown/tests/chown_test.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/chown/tests/chown_test.sh b/usr.sbin/chown/tests/chown_test.sh
index a5e55f928..b8b85ab47 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
-- 
2.42.0