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%% *}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
