Date: Wed, 16 Dec 2015 21:15:12 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292372 - projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs Message-ID: <201512162115.tBGLFCOw078415@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Dec 16 21:15:12 2015 New Revision: 292372 URL: https://svnweb.freebsd.org/changeset/base/292372 Log: ZFS test suite fixes for bootfs tests/sys/cddl/zfs/tests/bootfs/bootfs_003_pos.ksh * Fix typo in the cleanup routine. * Always use "-f" during zpool destroy for teardown purposes. "zpool destroy" should only not use "-f" if the non-forced functionality is under test. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_003_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_003_pos.ksh Wed Dec 16 21:11:51 2015 (r292371) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_003_pos.ksh Wed Dec 16 21:15:12 2015 (r292372) @@ -60,7 +60,7 @@ set -A pools "pool.${TESTCASE_ID}" "pool typeset VDEV=$TMPDIR/bootfs_003.${TESTCASE_ID}.dat function cleanup { - typeset -i=0 + typeset -i i=0 while [ $i -lt "${#pools[@]}" ]; do destroy_pool ${pools[$i]} i=$(( $i + 1 )) @@ -100,7 +100,7 @@ when encryption is set to on." then log_fail "Expected $RES == $POOL/$FS" fi - log_must $ZPOOL destroy $POOL + log_must $ZPOOL destroy -f $POOL i=$(( $i + 1 )) done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512162115.tBGLFCOw078415>