From owner-svn-src-projects@freebsd.org Thu Feb 8 21:57:36 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81DA3F0890B for ; Thu, 8 Feb 2018 21:57:36 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3435A8096C; Thu, 8 Feb 2018 21:57:36 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F5791BE47; Thu, 8 Feb 2018 21:57:36 +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 w18Lvaxi083840; Thu, 8 Feb 2018 21:57:36 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LvaqZ083839; Thu, 8 Feb 2018 21:57:36 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802082157.w18LvaqZ083839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 8 Feb 2018 21:57:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329043 - projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files X-SVN-Commit-Revision: 329043 X-SVN-Commit-Repository: base 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.25 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: Thu, 08 Feb 2018 21:57:36 -0000 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