diff options
| author | Ryan Moeller <[email protected]> | 2020-02-13 15:11:25 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-13 12:11:25 -0800 |
| commit | 71439163bb62ea1a931f8b359ded6c5b438f4baa (patch) | |
| tree | fa7e09559f0cf0f84acb54b290592c740db81fed | |
| parent | 3bdc4f6314ab55d1ee78ec8a2a6b77e5a3282ca3 (diff) | |
ZTS: Don't include zpool_create.shlib in zpool_add
The zpool_add tests include zpool_create.shlib for a few silly
variables.
Don't use those variables for the file names. Include zpool_add.kshlib
for whatever variables we still need.
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #9997
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add-o_ashift.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add-o_ashift.ksh index da3d16227..f975beccc 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add-o_ashift.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add-o_ashift.ksh @@ -25,7 +25,7 @@ # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/cli_root/zpool_create/zpool_create.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib # # DESCRIPTION: @@ -49,8 +49,8 @@ function cleanup log_assert "zpool add -o ashift=<n>' works with different ashift values" log_onexit cleanup -disk1=$TEST_BASE_DIR/$FILEDISK0 -disk2=$TEST_BASE_DIR/$FILEDISK1 +disk1=$TEST_BASE_DIR/disk1 +disk2=$TEST_BASE_DIR/disk2 log_must mkfile $SIZE $disk1 log_must mkfile $SIZE $disk2 diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh index ec94df835..61f5f6d1c 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_nested_replacing_spare.ksh @@ -25,7 +25,6 @@ # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/cli_root/zpool_create/zpool_create.shlib # # DESCRIPTION: diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_prop_ashift.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_prop_ashift.ksh index 184c7e3de..37887f3d1 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_prop_ashift.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/add_prop_ashift.ksh @@ -50,8 +50,8 @@ function cleanup log_assert "'zpool add' uses the ashift pool property value as default." log_onexit cleanup -disk1=$TEST_BASE_DIR/$FILEDISK0 -disk2=$TEST_BASE_DIR/$FILEDISK1 +disk1=$TEST_BASE_DIR/disk1 +disk2=$TEST_BASE_DIR/disk2 log_must mkfile $SIZE $disk1 log_must mkfile $SIZE $disk2 |