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 <mail@gmelikov.ru>
Reviewed-by: Damian Szuberski <szuberskidamian@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #14266

diff --git a/tests/runfiles/sanity.run b/tests/runfiles/sanity.run
index 51423966206f8126de2868e91d40359b3a94f2fa..b3a1737251172e40310db3223120bb36e5dafaa1 100644 (file)
--- 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 144a848cf3fadb56e0b1f68d14ab41fb1edda39e..32726acebf679b89fd0d73afd6029ead6a07ccd5 100644 (file)
--- 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 (file)
index bd8d6c9..0000000
--- 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