aboutsummaryrefslogtreecommitdiffstats
path: root/tests/zfs-tests
diff options
context:
space:
mode:
authorArvind Sankar <[email protected]>2020-06-25 14:14:54 -0400
committerBrian Behlendorf <[email protected]>2020-06-26 14:20:02 -0700
commit6b99fc0620f00fcfd201595b2bc6d279031dcb09 (patch)
treecc5149529e1148acaae62dc46b47b39c5090439e /tests/zfs-tests
parent7c902a5178496f1321ecb9f33df743a77278089e (diff)
Fixes for make dist
Reduce the usage of EXTRA_DIST. If files are conditionally included in _SOURCES, _HEADERS etc, automake is smart enough to dist all files that could possibly be included, but this does not apply to EXTRA_DIST, resulting in make dist depending on the configuration. Add some files that were missing altogether in various Makefile's. The changes to disted files in this commit (excluding deleted files): +./cmd/zed/agents/README.md +./etc/init.d/README.md +./lib/libspl/os/freebsd/getexecname.c +./lib/libspl/os/freebsd/gethostid.c +./lib/libspl/os/freebsd/getmntany.c +./lib/libspl/os/freebsd/mnttab.c -./lib/libzfs/libzfs_core.pc -./lib/libzfs/libzfs.pc +./lib/libzfs/os/freebsd/libzfs_compat.c +./lib/libzfs/os/freebsd/libzfs_fsshare.c +./lib/libzfs/os/freebsd/libzfs_ioctl_compat.c +./lib/libzfs/os/freebsd/libzfs_zmount.c +./lib/libzutil/os/freebsd/zutil_compat.c +./lib/libzutil/os/freebsd/zutil_device_path_os.c +./lib/libzutil/os/freebsd/zutil_import_os.c +./module/lua/README.zfs +./module/os/linux/spl/README.md +./tests/README.md +./tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_rm_nested.ksh +./tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh +./tests/zfs-tests/tests/functional/inheritance/README.config +./tests/zfs-tests/tests/functional/inheritance/README.state +./tests/zfs-tests/tests/functional/rsend/rsend_016_neg.ksh +./tests/zfs-tests/tests/perf/fio/sequential_readwrite.fio Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Arvind Sankar <[email protected]> Closes #10501
Diffstat (limited to 'tests/zfs-tests')
-rw-r--r--tests/zfs-tests/include/Makefile.am4
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am3
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am1
-rw-r--r--tests/zfs-tests/tests/functional/inheritance/Makefile.am2
-rw-r--r--tests/zfs-tests/tests/functional/pyzfs/Makefile.am4
-rw-r--r--tests/zfs-tests/tests/functional/rsend/Makefile.am1
-rw-r--r--tests/zfs-tests/tests/perf/fio/Makefile.am3
7 files changed, 10 insertions, 8 deletions
diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
index 929adc98d..5e9a4f386 100644
--- a/tests/zfs-tests/include/Makefile.am
+++ b/tests/zfs-tests/include/Makefile.am
@@ -17,6 +17,4 @@ $(nodist_pkgdata_DATA): %: %.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@'
-# Double-colon rules are allowed; there are multiple independent definitions.
-distclean-local::
- -$(RM) default.cfg
+CLEANFILES = default.cfg
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am
index 0a6c2eb85..06099c0c2 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile.am
@@ -13,4 +13,5 @@ dist_pkgdata_SCRIPTS = \
zfs_clone_009_neg.ksh \
zfs_clone_010_pos.ksh \
zfs_clone_encrypted.ksh \
- zfs_clone_deeply_nested.ksh
+ zfs_clone_deeply_nested.ksh \
+ zfs_clone_rm_nested.ksh
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am
index 2a476f3dc..9a492f323 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am
@@ -10,6 +10,7 @@ dist_pkgdata_SCRIPTS = \
zfs_send_006_pos.ksh \
zfs_send_007_pos.ksh \
zfs_send_encrypted.ksh \
+ zfs_send_encrypted_unloaded.ksh \
zfs_send_raw.ksh \
zfs_send_sparse.ksh \
zfs_send-b.ksh
diff --git a/tests/zfs-tests/tests/functional/inheritance/Makefile.am b/tests/zfs-tests/tests/functional/inheritance/Makefile.am
index 82de708d6..3c624621f 100644
--- a/tests/zfs-tests/tests/functional/inheritance/Makefile.am
+++ b/tests/zfs-tests/tests/functional/inheritance/Makefile.am
@@ -4,6 +4,8 @@ dist_pkgdata_SCRIPTS = \
inherit_001_pos.ksh
dist_pkgdata_DATA = \
+ README.config \
+ README.state \
inherit.kshlib \
config001.cfg \
config002.cfg \
diff --git a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
index 0c68c252b..f7aa56b95 100644
--- a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
+++ b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
@@ -14,6 +14,4 @@ $(pkgpyzfs_SCRIPTS):%:%.in
$< >'$@'
-chmod 775 $@
-# Double-colon rules are allowed; there are multiple independent definitions.
-distclean-local::
- -$(RM) $(pkgpyzfs_SCRIPTS)
+CLEANFILES = $(pkgpyzfs_SCRIPTS)
diff --git a/tests/zfs-tests/tests/functional/rsend/Makefile.am b/tests/zfs-tests/tests/functional/rsend/Makefile.am
index ab3a1c6c3..cf6c727df 100644
--- a/tests/zfs-tests/tests/functional/rsend/Makefile.am
+++ b/tests/zfs-tests/tests/functional/rsend/Makefile.am
@@ -18,6 +18,7 @@ dist_pkgdata_SCRIPTS = \
rsend_012_pos.ksh \
rsend_013_pos.ksh \
rsend_014_pos.ksh \
+ rsend_016_neg.ksh \
rsend_019_pos.ksh \
rsend_020_pos.ksh \
rsend_021_pos.ksh \
diff --git a/tests/zfs-tests/tests/perf/fio/Makefile.am b/tests/zfs-tests/tests/perf/fio/Makefile.am
index 619251682..e9f854d9e 100644
--- a/tests/zfs-tests/tests/perf/fio/Makefile.am
+++ b/tests/zfs-tests/tests/perf/fio/Makefile.am
@@ -6,4 +6,5 @@ dist_pkgdata_DATA = \
random_readwrite_fixed.fio \
random_writes.fio \
sequential_reads.fio \
- sequential_writes.fio
+ sequential_writes.fio \
+ sequential_readwrite.fio