From 954a380e19c9905deb2152275b13a0fb787b6923 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 9 Oct 2023 17:22:44 -0700 Subject: [PATCH] ZTS: Move zpool_import_hostid_changed* tests to Linux runfile Relocate the zpool_import_hostid_changed* test cases to the Linux runfile until these tests are modified to run cleanly on FreeBSD. Reviewed-by: George Melikov Signed-off-by: Brian Behlendorf Closes #15377 --- tests/runfiles/common.run | 4 ---- tests/runfiles/linux.run | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index 1435c55e8f..ef787c65c0 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -415,10 +415,6 @@ tests = ['zpool_import_001_pos', 'zpool_import_002_pos', 'zpool_import_rename_001_pos', 'zpool_import_all_001_pos', 'zpool_import_encrypted', 'zpool_import_encrypted_load', 'zpool_import_errata3', 'zpool_import_errata4', - 'zpool_import_hostid_changed', - 'zpool_import_hostid_changed_unclean_export', - 'zpool_import_hostid_changed_cachefile', - 'zpool_import_hostid_changed_cachefile_unclean_export', 'import_cachefile_device_added', 'import_cachefile_device_removed', 'import_cachefile_device_replaced', diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 2c8d5cb0ec..2252e46df3 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -82,6 +82,13 @@ tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos', 'zpool_expand_003_neg', 'zpool_expand_004_pos', 'zpool_expand_005_pos'] tags = ['functional', 'cli_root', 'zpool_expand'] +[tests/functional/cli_root/zpool_import:Linux] +tests = ['zpool_import_hostid_changed', + 'zpool_import_hostid_changed_unclean_export', + 'zpool_import_hostid_changed_cachefile', + 'zpool_import_hostid_changed_cachefile_unclean_export'] +tags = ['functional', 'cli_root', 'zpool_import'] + [tests/functional/cli_root/zpool_reopen:Linux] tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos', 'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos',