Date: Thu, 15 Mar 2018 14:35:46 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331002 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_get Message-ID: <201803151435.w2FEZk8b016287@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Mar 15 14:35:46 2018 New Revision: 331002 URL: https://svnweb.freebsd.org/changeset/base/331002 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. This should have been in r331001. Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh Thu Mar 15 14:23:31 2018 (r331001) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh Thu Mar 15 14:35:46 2018 (r331002) @@ -32,6 +32,4 @@ . ${STF_SUITE}/include/libtest.kshlib verify_runnable "both" -DISK=${DISKS%% *} - default_setup $DISK Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Thu Mar 15 14:23:31 2018 (r331001) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Thu Mar 15 14:35:46 2018 (r331002) @@ -69,3 +69,5 @@ typeset -a properties=( "feature@skein" # "feature@edonr" Edonr is not yet implemented on FreeBSD ) + +export DISK=${DISKS%% *}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803151435.w2FEZk8b016287>