From 71439163bb62ea1a931f8b359ded6c5b438f4baa Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 13 Feb 2020 15:11:25 -0500 Subject: [PATCH] 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 Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #9997 --- .../tests/functional/cli_root/zpool_add/add-o_ashift.ksh | 6 +++--- .../cli_root/zpool_add/add_nested_replacing_spare.ksh | 1 - .../tests/functional/cli_root/zpool_add/add_prop_ashift.ksh | 4 ++-- 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 da3d162273..f975beccce 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=' 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 ec94df8356..61f5f6d1ce 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 184c7e3def..37887f3d11 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