2 files changed, 80 insertions, 58 deletions
diff --git a/tools/regression/fstest/tests/chmod/08.t b/tools/regression/fstest/tests/chmod/08.t
index 110baceb7858..d502241fdf22 100644
--- a/tools/regression/fstest/tests/chmod/08.t
+++ b/tools/regression/fstest/tests/chmod/08.t
@@ -8,7 +8,16 @@ dir=`dirname $0`
 
 require chflags
 
-echo "1..40"
+case "${os}:${fs}" in
+FreeBSD:ZFS)
+	echo "1..22"
+	;;
+FreeBSD:UFS)
+	echo "1..44"
+	;;
+*)
+	quick_exit
+esac
 
 n0=`namegen`
 
@@ -18,30 +27,7 @@ expect EPERM chmod ${n0} 0600
 expect 0644 stat ${n0} mode
 expect 0 chflags ${n0} none
 expect 0 chmod ${n0} 0600
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_IMMUTABLE
-expect EPERM chmod ${n0} 0600
-expect 0644 stat ${n0} mode
-expect 0 chflags ${n0} none
-expect 0 chmod ${n0} 0600
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} SF_APPEND
-expect EPERM chmod ${n0} 0600
-expect 0644 stat ${n0} mode
-expect 0 chflags ${n0} none
-expect 0 chmod ${n0} 0600
-expect 0 unlink ${n0}
-
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_APPEND
-expect EPERM chmod ${n0} 0600
-expect 0644 stat ${n0} mode
-expect 0 chflags ${n0} none
-expect 0 chmod ${n0} 0600
+expect 0600 stat ${n0} mode
 expect 0 unlink ${n0}
 
 expect 0 create ${n0} 0644
@@ -51,9 +37,50 @@ expect 0600 stat ${n0} mode
 expect 0 chflags ${n0} none
 expect 0 unlink ${n0}
 
-expect 0 create ${n0} 0644
-expect 0 chflags ${n0} UF_NOUNLINK
-expect 0 chmod ${n0} 0600
-expect 0600 stat ${n0} mode
-expect 0 chflags ${n0} none
-expect 0 unlink ${n0}
+case "${os}:${fs}" in
+FreeBSD:ZFS)
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} SF_APPEND
+	expect 0 chmod ${n0} 0600
+	expect 0600 stat ${n0} mode
+	expect 0 chflags ${n0} none
+	expect 0 chmod ${n0} 0600
+	expect 0600 stat ${n0} mode
+	expect 0 unlink ${n0}
+	;;
+FreeBSD:UFS)
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} SF_APPEND
+	expect EPERM chmod ${n0} 0600
+	expect 0644 stat ${n0} mode
+	expect 0 chflags ${n0} none
+	expect 0 chmod ${n0} 0600
+	expect 0600 stat ${n0} mode
+	expect 0 unlink ${n0}
+
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} UF_IMMUTABLE
+	expect EPERM chmod ${n0} 0600
+	expect 0644 stat ${n0} mode
+	expect 0 chflags ${n0} none
+	expect 0 chmod ${n0} 0600
+	expect 0600 stat ${n0} mode
+	expect 0 unlink ${n0}
+
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} UF_NOUNLINK
+	expect 0 chmod ${n0} 0600
+	expect 0600 stat ${n0} mode
+	expect 0 chflags ${n0} none
+	expect 0 unlink ${n0}
+
+	expect 0 create ${n0} 0644
+	expect 0 chflags ${n0} UF_APPEND
+	expect EPERM chmod ${n0} 0600
+	expect 0644 stat ${n0} mode
+	expect 0 chflags ${n0} none
+	expect 0 chmod ${n0} 0600
+	expect 0600 stat ${n0} mode
+	expect 0 unlink ${n0}
+	;;
+esac
diff --git a/tools/regression/fstest/tests/chmod/09.t b/tools/regression/fstest/tests/chmod/09.t
index edf1f3ad992d..c3b610bf8d03 100644
--- a/tools/regression/fstest/tests/chmod/09.t
+++ b/tools/regression/fstest/tests/chmod/09.t
@@ -6,32 +6,27 @@ desc="chmod returns EROFS if the named file resides on a read-only file system"
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-case "${os}:${fs}" in
-FreeBSD:UFS)
-	echo "1..10"
+[ "${os}:${fs}" = "FreeBSD:UFS" ] || quick_exit
 
-	n0=`namegen`
-	n1=`namegen`
+echo "1..10"
 
-	expect 0 mkdir ${n0} 0755
-	n=`mdconfig -a -n -t malloc -s 1m`
-	newfs /dev/md${n} >/dev/null
-	mount /dev/md${n} ${n0}
-	expect 0 create ${n0}/${n1} 0644
-	expect 0 chmod ${n0}/${n1} 0640
-	expect 0640 stat ${n0}/${n1} mode
-	mount -ur /dev/md${n}
-	expect EROFS chmod ${n0}/${n1} 0600
-	expect 0640 stat ${n0}/${n1} mode
-	mount -uw /dev/md${n}
-	expect 0 chmod ${n0}/${n1} 0600
-	expect 0600 stat ${n0}/${n1} mode
-	expect 0 unlink ${n0}/${n1}
-	umount /dev/md${n}
-	mdconfig -d -u ${n}
-	expect 0 rmdir ${n0}
-	;;
-*)
-	quick_exit
-	;;
-esac
+n0=`namegen`
+n1=`namegen`
+
+expect 0 mkdir ${n0} 0755
+n=`mdconfig -a -n -t malloc -s 1m`
+newfs /dev/md${n} >/dev/null
+mount /dev/md${n} ${n0}
+expect 0 create ${n0}/${n1} 0644
+expect 0 chmod ${n0}/${n1} 0640
+expect 0640 stat ${n0}/${n1} mode
+mount -ur /dev/md${n}
+expect EROFS chmod ${n0}/${n1} 0600
+expect 0640 stat ${n0}/${n1} mode
+mount -uw /dev/md${n}
+expect 0 chmod ${n0}/${n1} 0600
+expect 0600 stat ${n0}/${n1} mode
+expect 0 unlink ${n0}/${n1}
+umount /dev/md${n}
+mdconfig -d -u ${n}
+expect 0 rmdir ${n0}