From b8e09c7007a0733a497aebe734cb8ed23a0415ae Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Wed, 8 Jan 2025 10:43:01 +1100 Subject: [PATCH] ZTS: remove empty zpool_add--allow-ashift-mismatch test Added in b1e46f869, but empty, so no point keeping it around. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Signed-off-by: Rob Norris Closes #16931 --- tests/runfiles/common.run | 3 +-- tests/zfs-tests/tests/Makefile.am | 1 - .../cli_root/zpool_add/zpool_add--allow-ashift-mismatch.ksh | 0 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100755 tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add--allow-ashift-mismatch.ksh diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index 8a4a4b0f5cb8..3ec052f56b40 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -387,8 +387,7 @@ tags = ['functional', 'cli_root', 'zpool'] tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos', 'zpool_add_004_pos', 'zpool_add_006_pos', 'zpool_add_007_neg', 'zpool_add_008_neg', 'zpool_add_009_neg', 'zpool_add_010_pos', - 'add-o_ashift', 'add_prop_ashift', 'zpool_add_dryrun_output', - 'zpool_add--allow-ashift-mismatch'] + 'add-o_ashift', 'add_prop_ashift', 'zpool_add_dryrun_output'] tags = ['functional', 'cli_root', 'zpool_add'] [tests/functional/cli_root/zpool_attach] diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am index df183825dc68..d62613d30035 100644 --- a/tests/zfs-tests/tests/Makefile.am +++ b/tests/zfs-tests/tests/Makefile.am @@ -998,7 +998,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/cli_root/zpool_add/add_prop_ashift.ksh \ functional/cli_root/zpool_add/cleanup.ksh \ functional/cli_root/zpool_add/setup.ksh \ - functional/cli_root/zpool_add/zpool_add--allow-ashift-mismatch.ksh \ functional/cli_root/zpool_add/zpool_add_001_pos.ksh \ functional/cli_root/zpool_add/zpool_add_002_pos.ksh \ functional/cli_root/zpool_add/zpool_add_003_pos.ksh \ diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add--allow-ashift-mismatch.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add--allow-ashift-mismatch.ksh deleted file mode 100755 index e69de29bb2d1..000000000000