From 062005122443945a5dd17c3e4edccd201dc39837 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 7 Dec 2022 17:26:33 -0800 Subject: [PATCH] ZTS: Add missing tests to Makefile.am The send-c_zstream_recompress.ksh test case was being skipped because it was not added to the Makefile.am, and was thus left out of the package. As for the renameat2 tests these were being skipped because when the patch was rebased it was not updated to use the new Makefile layout for the tests directory. Correct this. Add missing pre/post sections to sanity.run so the pyzfs tests will run. Reviewed-by: George Melikov Reviewed-by: Damian Szuberski Signed-off-by: Brian Behlendorf Closes #14266 --- tests/runfiles/sanity.run | 2 ++ tests/zfs-tests/tests/Makefile.am | 8 +++++++- tests/zfs-tests/tests/functional/renameat2/Makefile.am | 7 ------- 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 tests/zfs-tests/tests/functional/renameat2/Makefile.am diff --git a/tests/runfiles/sanity.run b/tests/runfiles/sanity.run index 5142396620..b3a1737251 100644 --- a/tests/runfiles/sanity.run +++ b/tests/runfiles/sanity.run @@ -627,4 +627,6 @@ tags = ['functional', 'zpool_influxdb'] [tests/functional/pyzfs] tests = ['pyzfs_unittest'] +pre = +post = tags = ['functional', 'pyzfs'] diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am index 144a848cf3..32726acebf 100644 --- a/tests/zfs-tests/tests/Makefile.am +++ b/tests/zfs-tests/tests/Makefile.am @@ -1711,6 +1711,11 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/rename_dirs/cleanup.ksh \ functional/rename_dirs/rename_dirs_001_pos.ksh \ functional/rename_dirs/setup.ksh \ + functional/renameat2/cleanup.ksh \ + functional/renameat2/setup.ksh \ + functional/renameat2/renameat2_exchange.ksh \ + functional/renameat2/renameat2_noreplace.ksh \ + functional/renameat2/renameat2_whiteout.ksh \ functional/replacement/attach_import.ksh \ functional/replacement/attach_multiple.ksh \ functional/replacement/attach_rebuild.ksh \ @@ -1789,7 +1794,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/rsend/send-c_incremental.ksh \ functional/rsend/send-c_lz4_disabled.ksh \ functional/rsend/send-c_mixed_compression.ksh \ - functional/rsend/send-cpL_varied_recsize.ksh \ functional/rsend/send-c_props.ksh \ functional/rsend/send-c_recv_dedup.ksh \ functional/rsend/send-c_recv_lz4_disabled.ksh \ @@ -1798,7 +1802,9 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/rsend/send-c_verify_contents.ksh \ functional/rsend/send-c_verify_ratio.ksh \ functional/rsend/send-c_volume.ksh \ + functional/rsend/send-c_zstream_recompress.ksh \ functional/rsend/send-c_zstreamdump.ksh \ + functional/rsend/send-cpL_varied_recsize.ksh \ functional/rsend/send_doall.ksh \ functional/rsend/send_encrypted_files.ksh \ functional/rsend/send_encrypted_hierarchy.ksh \ diff --git a/tests/zfs-tests/tests/functional/renameat2/Makefile.am b/tests/zfs-tests/tests/functional/renameat2/Makefile.am deleted file mode 100644 index bd8d6c9d68..0000000000 --- a/tests/zfs-tests/tests/functional/renameat2/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/renameat2 -dist_pkgdata_SCRIPTS = \ - setup.ksh \ - cleanup.ksh \ - renameat2_noreplace.ksh \ - renameat2_exchange.ksh \ - renameat2_whiteout.ksh