From 9887ef77c3cd7e6007825e7786742c0e859d2c69 Mon Sep 17 00:00:00 2001 From: Allan Jude Date: Wed, 12 Aug 2020 17:21:52 +0000 Subject: [PATCH 1/2] Hook up additional ZSTD tests Signed-off-by: Allan Jude --- tests/runfiles/common.run | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index f23814eda369..615c4efc461b 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -107,7 +107,7 @@ tests = ['zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos', 'zdb_005_pos', 'zdb_006_pos', 'zdb_args_neg', 'zdb_args_pos', 'zdb_block_size_histogram', 'zdb_checksum', 'zdb_decompress', 'zdb_display_block', 'zdb_object_range_neg', 'zdb_object_range_pos', - 'zdb_objset_id'] + 'zdb_objset_id', 'zdb_decompress_zstd'] pre = post = tags = ['functional', 'cli_root', 'zdb'] @@ -216,7 +216,7 @@ tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos', 'zfs_receive_016_pos', 'receive-o-x_props_override', 'zfs_receive_from_encrypted', 'zfs_receive_to_encrypted', 'zfs_receive_raw', 'zfs_receive_raw_incremental', 'zfs_receive_-e', - 'zfs_receive_raw_-d'] + 'zfs_receive_raw_-d', 'zfs_receive_from_zstd'] tags = ['functional', 'cli_root', 'zfs_receive'] [tests/functional/cli_root/zfs_rename] @@ -253,7 +253,8 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos', 'user_property_001_pos', 'user_property_003_neg', 'readonly_001_pos', 'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg', 'zfs_set_002_neg', 'zfs_set_003_neg', 'property_alias_001_pos', - 'mountpoint_003_pos', 'ro_props_001_pos', 'zfs_set_keylocation'] + 'mountpoint_003_pos', 'ro_props_001_pos', 'zfs_set_keylocation', + 'zfs_set_feature_activation'] tags = ['functional', 'cli_root', 'zfs_set'] [tests/functional/cli_root/zfs_share] From e349da2a198904e79921d848ec096651c9e35535 Mon Sep 17 00:00:00 2001 From: Allan Jude Date: Thu, 13 Aug 2020 21:56:42 +0000 Subject: [PATCH 2/2] [squash me] Add tests to makefile Signed-off-by: Allan Jude --- tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am | 1 + .../zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am index 3cf13f3ae60e..18420efcb26a 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/Makefile.am @@ -10,6 +10,7 @@ dist_pkgdata_SCRIPTS = \ zdb_block_size_histogram.ksh \ zdb_checksum.ksh \ zdb_decompress.ksh \ + zdb_decompress_zstd.ksh \ zdb_object_range_neg.ksh \ zdb_object_range_pos.ksh \ zdb_display_block.ksh \ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am index d3d81f8697e5..9c666cea7006 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am @@ -20,6 +20,7 @@ dist_pkgdata_SCRIPTS = \ zfs_receive_016_pos.ksh \ receive-o-x_props_override.ksh \ zfs_receive_from_encrypted.ksh \ + zfs_receive_from_zstd.ksh \ zfs_receive_to_encrypted.ksh \ zfs_receive_raw.ksh \ zfs_receive_raw_incremental.ksh \