From owner-svn-src-projects@freebsd.org  Wed Dec 16 21:15:14 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
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 03071A4A87E
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 16 Dec 2015 21:15:14 +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 C60A910B8;
 Wed, 16 Dec 2015 21:15:13 +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 tBGLFCVY078416;
 Wed, 16 Dec 2015 21:15:12 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGLFCOw078415;
 Wed, 16 Dec 2015 21:15:12 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201512162115.tBGLFCOw078415@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 16 Dec 2015 21:15:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292372 -
 projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs
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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2015 21:15:14 -0000

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