diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2018-03-15 14:23:31 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2018-03-15 14:23:31 +0000 |
| commit | 4da82917eac47167f03ffb7c27f0a789afbdc7f6 (patch) | |
| tree | 505ecb144d608ede74c0878613c2521b13ebbf6b /tests | |
| parent | 20d96999a4c7fe7e2cdf5056b8a293e266564f4a (diff) | |
| download | src-4da82917eac47167f03ffb7c27f0a789afbdc7f6.tar.gz src-4da82917eac47167f03ffb7c27f0a789afbdc7f6.zip | |
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.
Notes
Notes:
svn path=/head/; revision=331001
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh | 2 | ||||
| -rw-r--r-- | tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh index 65fbd87ff452..163da5f68dd0 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh @@ -31,6 +31,4 @@ . $STF_SUITE/include/libtest.kshlib -DISK=${DISKS%% *} - default_setup $DISK diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg index baeafdc97784..479e5bacb870 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg @@ -30,3 +30,5 @@ # . $STF_SUITE/tests/cli_root/cli.cfg + +export DISK=${DISKS%% *} |