svn commit: r292367 - in projects/zfsd/head/tests/sys/cddl/zfs: bin include tests/utils_test
Alan Somers
asomers at FreeBSD.org
Wed Dec 16 20:56:12 UTC 2015
Author: asomers
Date: Wed Dec 16 20:56:10 2015
New Revision: 292367
URL: https://svnweb.freebsd.org/changeset/base/292367
Log:
Unbreak utils_test_007_pos test, broken by the new fstyp(8) utility
tests/sys/cddl/zfs/bin/fstyp.ksh
Delete this Solaris compat shim
tests/sys/cddl/zfs/include/commands.txt
Fix the path to fstyp(8)
tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh
Remove solarisism and verify the output of fstyp(8)
Sponsored by: Spectra Logic Corp
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/bin/fstyp.ksh
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Wed Dec 16 20:54:28 2015 (r292366)
+++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Wed Dec 16 20:56:10 2015 (r292367)
@@ -14,7 +14,6 @@ SCRIPTS+= ff.ksh
SCRIPTS+= fmadm.ksh
SCRIPTS+= fmdump.ksh
SCRIPTS+= format.ksh
-SCRIPTS+= fstyp.ksh
SCRIPTS+= groupadd.ksh
SCRIPTS+= groupdel.ksh
SCRIPTS+= groupmod.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Wed Dec 16 20:54:28 2015 (r292366)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Wed Dec 16 20:56:10 2015 (r292367)
@@ -76,7 +76,7 @@
/sbin/fsdb
/sbin/fsirand
/usr/bin/fsync
-#%%STFSUITEDIR%%/bin/fstyp
+/usr/sbin/fstyp
/usr/bin/id
#/usr/bin/isainfo
#/usr/sbin/iscsiadm
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh Wed Dec 16 20:54:28 2015 (r292366)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_007_pos.ksh Wed Dec 16 20:56:10 2015 (r292367)
@@ -36,12 +36,12 @@
# ID: utils_test_007_pos
#
# DESCRIPTION:
-# Ensure that the fstyp(1M) utility succeeds on a ZFS file system.
+# Ensure that the fstyp(8) utility succeeds on a ZFS file system.
#
# STRATEGY:
# 1. Populate a ZFS file system with some files.
-# 2. Run fstyp(1M) against the device.
-# 3. Ensure it fails.
+# 2. Run fstyp(8) against the device.
+# 3. Ensure it passes
#
# TESTABILITY: explicit
#
@@ -66,7 +66,7 @@ function cleanup
log_onexit cleanup
-log_assert "Ensure that the fstyp(1M) utility succeeds on a ZFS file system."
+log_assert "Ensure that the fstyp(8) utility succeeds on a ZFS file system."
test_requires FSTYP
@@ -74,12 +74,10 @@ populate_dir $TESTDIR/$TESTFILE $NUM_FIL
log_must $ZFS unmount $TESTDIR
-if ! $(is_physical_device $DISK); then
- log_must $FSTYP $DISK
-elif [[ $WRAPPER == "smi" ]]; then
- log_must $FSTYP /dev/rdsk/${DISK}s2
-else
- log_must $FSTYP /dev/rdsk/${DISK}s0
-fi
+log_must $FSTYP $DISK
+detected_filesystem=$( $FSTYP $DISK )
+if [ "$detected_filesystem" != "zfs" ]; then
+ log_fail "fstyp(8) detected $detected_filesystem instead of zfs"
+fi
-log_pass "fstyp(1M) returned successfully."
+log_pass "fstyp(8) returned successfully."
More information about the svn-src-projects
mailing list