From owner-svn-src-projects@freebsd.org  Thu Feb  8 21:28:11 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E81B9F064E0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  8 Feb 2018 21:28:10 +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 99E8A7EFB8;
 Thu,  8 Feb 2018 21:28:10 +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 946B51B955;
 Thu,  8 Feb 2018 21:28:10 +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 w18LSAYm068594;
 Thu, 8 Feb 2018 21:28:10 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LSAw2068593;
 Thu, 8 Feb 2018 21:28:10 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201802082128.w18LSAw2068593@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: Thu, 8 Feb 2018 21:28:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r329038 -
 projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade
X-SVN-Commit-Revision: 329038
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 &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: Thu, 08 Feb 2018 21:28:11 -0000

Author: asomers
Date: Thu Feb  8 21:28:10 2018
New Revision: 329038
URL: https://svnweb.freebsd.org/changeset/base/329038

Log:
  Only use single disk pools for the zfs_upgrade tests.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh	Thu Feb  8 21:27:18 2018	(r329037)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh	Thu Feb  8 21:28:10 2018	(r329038)
@@ -30,7 +30,7 @@
 
 . $STF_SUITE/include/libtest.kshlib
 
-verify_runnable "both"
+DISK=${DISKS%% *}
 
 # This should have been set by the .cfg script - verify it's set to something
 # (we check that something later on)
@@ -41,4 +41,4 @@ else
    log_note "This machine is running ZFS Filesystem version $ZFS_VERSION"
 fi
 
-default_setup "$DISKS"
+default_setup "$DISK"