From owner-svn-src-projects@freebsd.org Wed Dec 16 19:28:44 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E24AA49549 for ; Wed, 16 Dec 2015 19:28:44 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 003AB1EC8; Wed, 16 Dec 2015 19:28:43 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBGJShiB045467; Wed, 16 Dec 2015 19:28:43 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGJShkq045466; Wed, 16 Dec 2015 19:28:43 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512161928.tBGJShkq045466@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 19:28:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292352 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2015 19:28:44 -0000 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