svn commit: r329234 - in projects/zfsd/head/tests/sys/cddl/zfs: bin include tests/clean_mirror tests/cli_root/zfs_upgrade tests/devices tests/largest_pool tests/scrub_mirror
Alan Somers
asomers at FreeBSD.org
Tue Feb 13 17:56:02 UTC 2018
Author: asomers
Date: Tue Feb 13 17:56:00 2018
New Revision: 329234
URL: https://svnweb.freebsd.org/changeset/base/329234
Log:
Use native df(1) in the ZFS test suite
Eliminate the weird Illumos partial-compatibility wrapper.
tests/sys/cddl/zfs/bin/Makefile
tests/sys/cddl/zfs/bin/df.ksh
Delete the compatibility wrapper
tests/sys/cddl/zfs/include/libtest.kshlib
tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh
tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
tests/sys/cddl/zfs/tests/devices/devices_common.kshlib
tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh
tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh
Adjust usage of df
Sponsored by: Spectra Logic Corp
Deleted:
projects/zfsd/head/tests/sys/cddl/zfs/bin/df.ksh
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Tue Feb 13 17:56:00 2018 (r329234)
@@ -8,7 +8,6 @@ BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin
SCRIPTSDIR= ${TESTSBASE}/sys/cddl/zfs/bin
SCRIPTS+= bsddisks.ksh
-SCRIPTS+= df.ksh
SCRIPTS+= dircmp.ksh
SCRIPTS+= dumpadm.ksh
SCRIPTS+= ff.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Tue Feb 13 17:56:00 2018 (r329234)
@@ -2756,11 +2756,7 @@ function get_fstype
log_fail "Usage: get_fstype <directory>"
fi
- #
- # $ df -n /
- # / : ufs
- #
- $DF -n $dir | $AWK '{print $3}'
+ $DF -T $dir | $AWK '{print $2}'
}
#
@@ -2936,8 +2932,7 @@ function pool_prop_exist
#
function is_zfsroot
{
- $DF -n / | $GREP zfs > /dev/null 2>&1
- return $?
+ $DF -T / | $GREP -q zfs
}
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh Tue Feb 13 17:56:00 2018 (r329234)
@@ -31,7 +31,7 @@
verify_runnable "global"
-$DF -F zfs -h | $GREP "$TESTFS " >/dev/null
+$DF -t zfs -h | $GREP "$TESTFS " >/dev/null
[[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR
destroy_pool $TESTPOOL
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Tue Feb 13 17:56:00 2018 (r329234)
@@ -137,7 +137,7 @@ function default_check_zfs_upgrade #rootfs
typeset newv
typeset -i df_ret
- $DF -F zfs / > /dev/null 2>&1
+ $DF -t zfs / > /dev/null 2>&1
df_ret=$?
for newv in "" $ZFS_VERSION; do
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh Tue Feb 13 17:56:00 2018 (r329234)
@@ -90,7 +90,7 @@ function setup_datasets
log_assert "Executing 'zfs upgrade [-V version] -a' command succeeds."
-$DF -F zfs / > /dev/null 2>&1
+$DF -t zfs / > /dev/null 2>&1
if (( $? == 0 )) ; then
log_unsupported "This case should not run on ZFS root system"
fi
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib Tue Feb 13 17:56:00 2018 (r329234)
@@ -42,7 +42,7 @@ function create_dev_file
case $filetype in
b)
- devtype=$($DF -n / | $AWK '{print $3}')
+ devtype=$($DF -T / | $AWK '{print $2}')
case $devtype in
zfs)
rootpool=$($DF / | \
@@ -62,7 +62,7 @@ function create_dev_file
# Get the existing block device file in current system.
# And bring out the first one.
#
- devstr=$($DF -lhF ufs | \
+ devstr=$($DF -lht ufs | \
$GREP "^/dev/dsk" | \
$AWK '{print $1}')
devstr=$($ECHO "$devstr" | \
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh Tue Feb 13 17:56:00 2018 (r329234)
@@ -79,7 +79,7 @@ function parse_expected_output
$AWK '{print $2}' | $GREP $CHKUNIT"
log_note "Detect the file system in this test machine."
- log_must eval "$DF -F zfs -h > $TMPDIR/j.${TESTCASE_ID}"
+ log_must eval "$DF -t zfs -h > $TMPDIR/j.${TESTCASE_ID}"
log_must eval "$GREP $TESTPOOL $TMPDIR/j.${TESTCASE_ID} | \
$AWK '{print $2}' | $GREP $CHKUNIT"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh Tue Feb 13 17:52:00 2018 (r329233)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh Tue Feb 13 17:56:00 2018 (r329234)
@@ -31,7 +31,7 @@
verify_runnable "global"
-$DF -F zfs -h | $GREP "$TESTFS " >/dev/null
+$DF -t zfs -h | $GREP "$TESTFS " >/dev/null
[[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR
destroy_pool $TESTPOOL
More information about the svn-src-projects
mailing list