diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index e1315902b..72745bfa7 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -290,7 +290,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', 'add_nested_replacing_spare'] + 'add-o_ashift', 'add_prop_ashift'] tags = ['functional', 'cli_root', 'zpool_add'] [tests/functional/cli_root/zpool_attach] @@ -329,11 +329,6 @@ tags = ['functional', 'cli_root', 'zpool_destroy'] tests = ['zpool_detach_001_neg'] tags = ['functional', 'cli_root', 'zpool_detach'] -[tests/functional/cli_root/zpool_expand] -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_export] tests = ['zpool_export_001_pos', 'zpool_export_002_pos', 'zpool_export_003_neg', 'zpool_export_004_pos'] @@ -409,12 +404,6 @@ tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos', 'zpool_remove_003_pos'] tags = ['functional', 'cli_root', 'zpool_remove'] -[tests/functional/cli_root/zpool_reopen] -tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos', - 'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos', - 'zpool_reopen_006_neg', 'zpool_reopen_007_pos'] -tags = ['functional', 'cli_root', 'zpool_reopen'] - [tests/functional/cli_root/zpool_replace] tests = ['zpool_replace_001_neg', 'replace-o_ashift', 'replace_prop_ashift'] tags = ['functional', 'cli_root', 'zpool_replace'] @@ -551,12 +540,6 @@ tags = ['functional', 'delegate'] tests = ['exec_001_pos', 'exec_002_neg'] tags = ['functional', 'exec'] -[tests/functional/fault] -tests = ['auto_offline_001_pos', 'auto_online_001_pos', 'auto_replace_001_pos', - 'auto_spare_001_pos', 'auto_spare_002_pos', 'auto_spare_multiple', - 'auto_spare_shared', 'decrypt_fault', 'decompress_fault'] -tags = ['functional', 'fault'] - [tests/functional/features/async_destroy] tests = ['async_destroy_001_pos'] tags = ['functional', 'features', 'async_destroy'] @@ -627,15 +610,8 @@ tags = ['functional', 'migration'] tests = ['mmap_write_001_pos', 'mmap_read_001_pos'] tags = ['functional', 'mmap'] -[tests/functional/mmp] -tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval', - 'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import', - 'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history', - 'mmp_on_zdb', 'mmp_write_distribution', 'mmp_hostid'] -tags = ['functional', 'mmp'] - [tests/functional/mount] -tests = ['umount_001', 'umount_unlinked_drain', 'umountall_001'] +tests = ['umount_001', 'umountall_001'] tags = ['functional', 'mount'] [tests/functional/mv_files] @@ -888,8 +864,7 @@ tests = ['zvol_misc_002_pos', 'zvol_misc_hierarchy', 'zvol_misc_rename_inuse', tags = ['functional', 'zvol', 'zvol_misc'] [tests/functional/zvol/zvol_swap] -tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_003_pos', - 'zvol_swap_004_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos'] +tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_004_pos'] tags = ['functional', 'zvol', 'zvol_swap'] [tests/functional/libzfs] diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index b4322991e..669750913 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -55,11 +55,26 @@ tests = ['zfeature_set_unsupported', 'zfs_get_unsupported', 'zpool_set_unsupported'] tags = ['functional', 'cli_root', 'zfs_sysfs'] +[tests/functional/cli_root/zpool_add:Linux] +tests = ['add_nested_replacing_spare'] +tags = ['functional', 'cli_root', 'zpool_add'] + [tests/functional/cli_root/zpool_events:Linux] tests = ['zpool_events_clear', 'zpool_events_cliargs', 'zpool_events_follow', 'zpool_events_poolname', 'zpool_events_errors'] tags = ['functional', 'cli_root', 'zpool_events'] +[tests/functional/cli_root/zpool_expand:Linux] +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_reopen:Linux] +tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos', + 'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos', + 'zpool_reopen_006_neg', 'zpool_reopen_007_pos'] +tags = ['functional', 'cli_root', 'zpool_reopen'] + [tests/functional/compression:Linux] tests = ['compress_004_pos'] tags = ['functional', 'compression'] @@ -79,7 +94,10 @@ tests = ['events_001_pos', 'events_002_pos', 'zed_rc_filter'] tags = ['functional', 'events'] [tests/functional/fault:Linux] -tests = ['auto_spare_ashift', 'scrub_after_resilver', 'zpool_status_-s'] +tests = ['auto_offline_001_pos', 'auto_online_001_pos', 'auto_replace_001_pos', + 'auto_spare_001_pos', 'auto_spare_002_pos', 'auto_spare_multiple', + 'auto_spare_ashift', 'auto_spare_shared', 'decrypt_fault', + 'decompress_fault', 'scrub_after_resilver', 'zpool_status_-s'] tags = ['functional', 'fault'] [tests/functional/features/large_dnode:Linux] @@ -94,6 +112,17 @@ tags = ['functional', 'io'] tests = ['mmap_libaio_001_pos'] tags = ['functional', 'mmap'] +[tests/functional/mmp:Linux] +tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval', + 'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import', + 'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history', + 'mmp_on_zdb', 'mmp_write_distribution', 'mmp_hostid'] +tags = ['functional', 'mmp'] + +[tests/functional/mount:Linux] +tests = ['umount_unlinked_drain'] +tags = ['functional', 'mount'] + [tests/functional/procfs:Linux] tests = ['procfs_list_basic', 'procfs_list_concurrent_readers', 'procfs_list_stale_read', 'pool_state'] diff --git a/tests/runfiles/sunos.run b/tests/runfiles/sunos.run index 232f561a7..129e1c570 100644 --- a/tests/runfiles/sunos.run +++ b/tests/runfiles/sunos.run @@ -41,3 +41,7 @@ tags = ['functional', 'xattr'] tests = ['zvol_misc_001_neg', 'zvol_misc_003_neg', 'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos'] tags = ['functional', 'zvol', 'zvol_misc'] + +[tests/functional/zvol/zvol_swap:illumos] +tests = ['zvol_swap_003_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos'] +tags = ['functional', 'zvol', 'zvol_swap'] diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py index 66ecbeb07..c5a1a2c3b 100755 --- a/tests/test-runner/bin/zts-report.py +++ b/tests/test-runner/bin/zts-report.py @@ -162,9 +162,6 @@ known = { 'rootpool/setup': ['SKIP', na_reason], 'rsend/rsend_008_pos': ['SKIP', '6066'], 'vdev_zaps/vdev_zaps_007_pos': ['FAIL', known_reason], - 'zvol/zvol_swap/zvol_swap_003_pos': ['SKIP', na_reason], - 'zvol/zvol_swap/zvol_swap_005_pos': ['SKIP', na_reason], - 'zvol/zvol_swap/zvol_swap_006_pos': ['SKIP', na_reason], } # diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh index 59d9a462e..6106f7ee7 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh @@ -56,6 +56,8 @@ function cleanup log_assert "Using a zvol as swap space, fill /var/tmp to 80%." +log_onexit cleanup + vol=$TESTPOOL/$TESTVOL swapdev=${ZVOL_DEVDIR}/$vol log_must swap_setup $swapdev diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh index d071de7e4..aafdb7a49 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh @@ -46,10 +46,6 @@ verify_runnable "global" -if is_linux || is_freebsd; then - log_unsupported "Modifies global non-ZFS system config" -fi - function cleanup { [[ -f $TESTDIR/$TESTFILE ]] && log_must rm -f $TESTDIR/$TESTFILE diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh index 6d51acbe9..b22bfdb16 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh @@ -44,10 +44,6 @@ verify_runnable "global" -if is_linux || is_freebsd; then - log_unsupported "swaplow + swaplen unsupported Linux/FreeBSD options" -fi - assertion="Verify the sum of swaplow and swaplen is less or equal to volsize" log_assert $assertion diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh index 7db274eb7..5788a8643 100755 --- a/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh @@ -45,10 +45,6 @@ verify_runnable "global" -if is_linux || is_freebsd; then - log_unsupported "swaplow + swaplen unsupported Linux/FreeBSD options" -fi - function cleanup { typeset -i i=0