From fdf5593232b80c445ed848d072010eba5968ed28 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Fri, 25 Oct 2019 23:03:46 -0400 Subject: [PATCH] ZTS: Move more tests to linux.run Tests that rely on special filesystems that are specific to Linux should only be run on Linux. Reviewed-by: Igor Kozhukhov Reviewed-by: Brian Behlendorf Reviewed-by: Giuseppe Di Natale Signed-off-by: Ryan Moeller Closes #9512 --- tests/runfiles/common.run | 11 ----------- tests/runfiles/linux.run | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index 423ce81589..d6d3874f68 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -253,12 +253,6 @@ tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg', 'zfs_snapshot_009_pos'] tags = ['functional', 'cli_root', 'zfs_snapshot'] -[tests/functional/cli_root/zfs_sysfs] -tests = ['zfeature_set_unsupported', 'zfs_get_unsupported', - 'zfs_set_unsupported', 'zfs_sysfs_live', 'zpool_get_unsupported', - 'zpool_set_unsupported'] -tags = ['functional', 'cli_root', 'zfs_sysfs'] - [tests/functional/cli_root/zfs_unload-key] tests = ['zfs_unload-key', 'zfs_unload-key_all', 'zfs_unload-key_recursive'] tags = ['functional', 'cli_root', 'zfs_unload-key'] @@ -691,11 +685,6 @@ tags = ['functional', 'poolversion'] tests = ['privilege_001_pos', 'privilege_002_pos'] tags = ['functional', 'privilege'] -[tests/functional/procfs] -tests = ['procfs_list_basic', 'procfs_list_concurrent_readers', - 'procfs_list_stale_read', 'pool_state'] -tags = ['functional', 'procfs'] - [tests/functional/pyzfs] tests = ['pyzfs_unittest'] pre = diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 2ccf3b2ae1..777588ac4a 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -44,6 +44,12 @@ tags = ['functional', 'cli_root', 'zfs'] tests = ['zfs_mount_006_pos', 'zfs_mount_008_pos', 'zfs_multi_mount'] tags = ['functional', 'cli_root', 'zfs_mount'] +[tests/functional/cli_root/zfs_sysfs:Linux] +tests = ['zfeature_set_unsupported', 'zfs_get_unsupported', + 'zfs_set_unsupported', 'zfs_sysfs_live', 'zpool_get_unsupported', + 'zpool_set_unsupported'] +tags = ['functional', 'cli_root', 'zfs_sysfs'] + [tests/functional/cli_root/zpool_events:Linux] tests = ['zpool_events_clear', 'zpool_events_cliargs', 'zpool_events_follow', 'zpool_events_poolname', 'zpool_events_errors'] @@ -83,6 +89,11 @@ tags = ['functional', 'io'] tests = ['mmap_libaio_001_pos'] tags = ['functional', 'mmap'] +[tests/functional/procfs:Linux] +tests = ['procfs_list_basic', 'procfs_list_concurrent_readers', + 'procfs_list_stale_read', 'pool_state'] +tags = ['functional', 'procfs'] + [tests/functional/projectquota:Linux] tests = ['projectid_001_pos', 'projectid_002_pos', 'projectid_003_pos', 'projectquota_001_pos', 'projectquota_002_pos', 'projectquota_003_pos',