svn commit: r292352 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy

Alan Somers asomers at FreeBSD.org
Wed Dec 16 19:28:44 UTC 2015


Author: asomers
Date: Wed Dec 16 19:28:42 2015
New Revision: 292352
URL: https://svnweb.freebsd.org/changeset/base/292352

Log:
  setup_testenv: Make the newfs call easier to debug.  log_must the call
  instead of checking its return and calling log_fail.  Also, don't bother
  suppressing its output.
  
  Submitted by:	Will
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib	Wed Dec 16 19:27:20 2015	(r292351)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib	Wed Dec 16 19:28:42 2015	(r292352)
@@ -56,13 +56,7 @@ function setup_testenv #[dtst]
 	# Volume test is only availible on globle zone
 	if ! datasetexists $VOL && is_global_zone; then
 		log_must $ZFS create -V $VOLSIZE $VOL
-
-		$ECHO "y" | $NEWFS /dev/zvol/$VOL > /dev/null 2>&1
-		if (( $? == 0 )); then
-			log_note "SUCCESS: $NEWFS /dev/zvol/$VOL>/dev/null"
-		else
-			log_fail "$NEWFS /dev/zvol/$VOL > /dev/null"
-		fi
+		log_must $NEWFS /dev/zvol/$VOL
 
 		if [[ ! -d $TESTDIR1 ]]; then
 			log_must $MKDIR $TESTDIR1


More information about the svn-src-projects mailing list