From owner-svn-src-all@freebsd.org Thu Mar 15 14:23:32 2018 Return-Path: Delivered-To: svn-src-all@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 16C1EF55ED6; Thu, 15 Mar 2018 14:23:32 +0000 (UTC) (envelope-from avg@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 B65AF834AC; Thu, 15 Mar 2018 14:23:31 +0000 (UTC) (envelope-from avg@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 AC54817364; Thu, 15 Mar 2018 14:23:31 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FENVdX011483; Thu, 15 Mar 2018 14:23:31 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FENVFw011481; Thu, 15 Mar 2018 14:23:31 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803151423.w2FENVFw011481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 14:23:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331001 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_export X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/tests/sys/cddl/zfs/tests/cli_root/zpool_export X-SVN-Commit-Revision: 331001 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 14:23:32 -0000 Author: avg Date: Thu Mar 15 14:23:31 2018 New Revision: 331001 URL: https://svnweb.freebsd.org/changeset/base/331001 Log: zfs test suite: move definition of DISK to the cfg file in zpool_export The variable is used not only by the setup script but also by the atf test bodies. Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh Thu Mar 15 13:46:28 2018 (r331000) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh Thu Mar 15 14:23:31 2018 (r331001) @@ -31,6 +31,4 @@ . $STF_SUITE/include/libtest.kshlib -DISK=${DISKS%% *} - default_setup $DISK Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg Thu Mar 15 13:46:28 2018 (r331000) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg Thu Mar 15 14:23:31 2018 (r331001) @@ -30,3 +30,5 @@ # . $STF_SUITE/tests/cli_root/cli.cfg + +export DISK=${DISKS%% *}