svn commit: r329043 - projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files
Alan Somers
asomers at FreeBSD.org
Thu Feb 8 21:57:36 UTC 2018
Author: asomers
Date: Thu Feb 8 21:57:35 2018
New Revision: 329043
URL: https://svnweb.freebsd.org/changeset/base/329043
Log:
Fix ZFS's mv_files tests when no disks are defined
tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh
Delete some extraneous steps from the cleanup that cause the test to
fail if it was skipped.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh Thu Feb 8 21:55:46 2018 (r329042)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh Thu Feb 8 21:57:35 2018 (r329043)
@@ -29,16 +29,10 @@
. $STF_SUITE/include/libtest.kshlib
-verify_runnable "global"
-
[[ -f $TMPDIR/exitsZero.ksh ]] && \
log_must $RM -f $TMPDIR/exitsZero.ksh
[[ -f $TMPDIR/testbackgprocs.ksh ]] && \
log_must $RM -f $TMPDIR/testbackgprocs.ksh
-
-ismounted $TESTPOOL/$TESTFS_TGT
-(( $? == 0 )) && log_must $ZFS umount $TESTPOOL/$TESTFS_TGT
-log_must $ZFS destroy $TESTPOOL/$TESTFS_TGT
if [[ -d $TESTDIR_TGT ]]; then
log_must $RM -rf $TESTDIR_TGT
More information about the svn-src-projects
mailing list