From bd539a8e3c8294d3607cb927f1c21a05b474a982 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Thu, 15 Mar 2018 14:47:53 +0000 Subject: [PATCH] zfs test suite: move definition of DISK to the cfg file in zpool_get The variable is used not only by the setup script but also by the atf test bodies. Another one that should have been in r331001. --- tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh | 1 - .../sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh index 491e9e1fa039..9d25451bcc9e 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh @@ -31,5 +31,4 @@ . $STF_SUITE/include/libtest.kshlib -DISK=${DISKS%% *} default_container_volume_setup $DISK diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg index d189b0ed6113..a12d57b2724b 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg @@ -28,3 +28,5 @@ # . $STF_SUITE/tests/cli_root/cli.cfg + +export DISK=${DISKS%% *}