Author: avg Date: Thu Mar 15 14:47:53 2018 New Revision: 331004 URL: https://svnweb.freebsd.org/changeset/base/331004
Log: 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. Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh Thu Mar 15 14:41:09 2018 (r331003) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh Thu Mar 15 14:47:53 2018 (r331004) @@ -31,5 +31,4 @@ . $STF_SUITE/include/libtest.kshlib -DISK=${DISKS%% *} default_container_volume_setup $DISK Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg Thu Mar 15 14:41:09 2018 (r331003) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg Thu Mar 15 14:47:53 2018 (r331004) @@ -28,3 +28,5 @@ # . $STF_SUITE/tests/cli_root/cli.cfg + +export DISK=${DISKS%% *} _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"