Fix "file is executable, but no shebang" warnings

Fedora 28's RPM build checks warn when executable files don't have a
shebang line.  These warnings are caused when we (incorrectly)
include data & config files in the_SCRIPTS automake lines. Files in
_SCRIPTS are marked executable by automake. This patch fixes the
issue by including non-executable scripts in a _DATA line instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #7359
Closes #7395

diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am
index 7b65429fd7f92f375d91d88d5a7e6c272c47f0dd..a550311cd744560234c565b1821ca519cb0b9210 100644 (file)
--- a/contrib/initramfs/scripts/Makefile.am
+++ b/contrib/initramfs/scripts/Makefile.am
@@ -1,6 +1,6 @@
 scriptsdir = $(datarootdir)/initramfs-tools/scripts
 
-scripts_SCRIPTS = \
+scripts_DATA = \
        zfs
 
 SUBDIRS = local-top
@@ -8,7 +8,7 @@ SUBDIRS = local-top
 EXTRA_DIST = \
        $(top_srcdir)/contrib/initramfs/scripts/zfs.in
 
-$(scripts_SCRIPTS):%:%.in
+$(scripts_DATA):%:%.in
        -$(SED) -e 's,@sbindir\@,$(sbindir),g' \
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< >'$@'

diff --git a/tests/runfiles/Makefile.am b/tests/runfiles/Makefile.am
index cddfb2ed6fe021e45e8040a6ee5ef25a081059eb..138d905a5722c8859828896e8e2575a7d5d4a58a 100644 (file)
--- a/tests/runfiles/Makefile.am
+++ b/tests/runfiles/Makefile.am
@@ -1,2 +1,2 @@
 pkgdatadir = $(datadir)/@PACKAGE@/runfiles
-dist_pkgdata_SCRIPTS = *.run
+dist_pkgdata_DATA = *.run

diff --git a/tests/test-runner/include/Makefile.am b/tests/test-runner/include/Makefile.am
index d071dd4957092e98235f1f60ed08f9358360b836..7e4080249ad6db178be58f56a65a50847d867b3f 100644 (file)
--- a/tests/test-runner/include/Makefile.am
+++ b/tests/test-runner/include/Makefile.am
@@ -1,4 +1,6 @@
 pkgdatadir = $(datadir)/@PACKAGE@/test-runner/include
 dist_pkgdata_SCRIPTS = \
-       logapi.shlib \
+       logapi.shlib
+
+dist_pkgdata_DATA = \
        stf.shlib

diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
index e5daa7f5f017696efc98a43a781bc64169e3ee70..52e1c0a9f5179f7cc4ee386125b3c3b748bd553d 100644 (file)
--- a/tests/zfs-tests/include/Makefile.am
+++ b/tests/zfs-tests/include/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/include
-dist_pkgdata_SCRIPTS = \
+dist_pkgdata_DATA = \
        blkdev.shlib \
        commands.cfg \
        default.cfg \

diff --git a/tests/zfs-tests/tests/functional/acl/Makefile.am b/tests/zfs-tests/tests/functional/acl/Makefile.am
index 6a0258385f1ea4bc0b4ff7dd06438fabf3eae55b..6086930e36fa4c03fc1732f9933a10e8606ad2e9 100644 (file)
--- a/tests/zfs-tests/tests/functional/acl/Makefile.am
+++ b/tests/zfs-tests/tests/functional/acl/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/acl
-dist_pkgdata_SCRIPTS = \
+dist_pkgdata_DATA = \
        acl.cfg \
        acl_common.kshlib
 

diff --git a/tests/zfs-tests/tests/functional/atime/Makefile.am b/tests/zfs-tests/tests/functional/atime/Makefile.am
index e072925544b9fb66cff5b1c82093704a7a6f860e..a4e2335a9ca086e4f82e0dbd238c0357353d14ad 100644 (file)
--- a/tests/zfs-tests/tests/functional/atime/Makefile.am
+++ b/tests/zfs-tests/tests/functional/atime/Makefile.am
@@ -1,9 +1,11 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/atime
 dist_pkgdata_SCRIPTS = \
-       atime.cfg \
-       atime_common.kshlib \
        cleanup.ksh \
        setup.ksh \
        atime_001_pos.ksh \
        atime_002_neg.ksh \
        atime_003_pos.ksh
+
+dist_pkgdata_DATA = \
+       atime.cfg \
+       atime_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/cache/Makefile.am b/tests/zfs-tests/tests/functional/cache/Makefile.am
index f1aaf721cae6fbf6c28dc4364a1d70a40727b668..18dd9c1985ebde8728a87890a6de1f413f0465ab 100644 (file)
--- a/tests/zfs-tests/tests/functional/cache/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cache/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cache
 dist_pkgdata_SCRIPTS = \
-       cache.cfg \
-       cache.kshlib \
        cleanup.ksh \
        setup.ksh \
        cache_001_pos.ksh \
@@ -15,3 +13,7 @@ dist_pkgdata_SCRIPTS = \
        cache_009_pos.ksh \
        cache_010_neg.ksh \
        cache_011_pos.ksh
+
+dist_pkgdata_DATA = \
+       cache.cfg \
+       cache.kshlib

diff --git a/tests/zfs-tests/tests/functional/cachefile/Makefile.am b/tests/zfs-tests/tests/functional/cachefile/Makefile.am
index 89d6a9b860a31a1091a70f6fb026f18108e12eaa..53d8c8c6c9d5de7cf7a2632144e0df4c09456ea1 100644 (file)
--- a/tests/zfs-tests/tests/functional/cachefile/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cachefile/Makefile.am
@@ -2,9 +2,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cachefile
 dist_pkgdata_SCRIPTS = \
        cleanup.ksh \
        setup.ksh \
-       cachefile.cfg \
-       cachefile.kshlib \
        cachefile_001_pos.ksh \
        cachefile_002_pos.ksh \
        cachefile_003_pos.ksh \
        cachefile_004_pos.ksh
+
+dist_pkgdata_DATA = \
+       cachefile.cfg \
+       cachefile.kshlib

diff --git a/tests/zfs-tests/tests/functional/casenorm/Makefile.am b/tests/zfs-tests/tests/functional/casenorm/Makefile.am
index 00cb59074ed2ec58baf58103d9750454d356c1e5..b284a2560b272e71bf644122167fa65731e8aa61 100644 (file)
--- a/tests/zfs-tests/tests/functional/casenorm/Makefile.am
+++ b/tests/zfs-tests/tests/functional/casenorm/Makefile.am
@@ -3,8 +3,6 @@ dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
        case_all_values.ksh \
-       casenorm.cfg \
-       casenorm.kshlib \
        insensitive_formd_delete.ksh \
        insensitive_formd_lookup.ksh \
        insensitive_none_delete.ksh \
@@ -21,3 +19,7 @@ dist_pkgdata_SCRIPTS = \
        sensitive_formd_lookup.ksh \
        sensitive_none_delete.ksh \
        sensitive_none_lookup.ksh
+
+dist_pkgdata_DATA = \
+       casenorm.cfg \
+       casenorm.kshlib

diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/Makefile.am b/tests/zfs-tests/tests/functional/channel_program/lua_core/Makefile.am
index 6de88d723b625231ef6d8a7bf4ddb25345b10c77..e06b145dccc47316e454276a156b25fda2d94986 100644 (file)
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/Makefile.am
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/Makefile.am
@@ -3,39 +3,41 @@ dist_pkgdata_SCRIPTS = \
        cleanup.ksh \
        setup.ksh \
        tst.args_to_lua.ksh \
-       tst.args_to_lua.out \
-       tst.args_to_lua.zcp \
-       tst.divide_by_zero.err \
        tst.divide_by_zero.ksh \
-       tst.divide_by_zero.zcp \
        tst.exists.ksh \
-       tst.exists.zcp \
        tst.integer_illegal.ksh \
        tst.integer_overflow.ksh \
        tst.language_functions_neg.ksh \
        tst.language_functions_pos.ksh \
        tst.large_prog.ksh \
-       tst.large_prog.out \
-       tst.large_prog.zcp \
-       tst.lib_base.lua \
-       tst.lib_coroutine.lua \
-       tst.lib_strings.lua \
-       tst.lib_table.lua \
        tst.libraries.ksh \
        tst.memory_limit.ksh \
        tst.nested_neg.ksh \
-       tst.nested_neg.zcp \
        tst.nested_pos.ksh \
-       tst.nested_pos.zcp \
        tst.nvlist_to_lua.ksh \
        tst.recursive_neg.ksh \
        tst.recursive_pos.ksh \
-       tst.recursive.zcp \
        tst.return_large.ksh \
-       tst.return_large.zcp \
        tst.return_nvlist_neg.ksh \
        tst.return_nvlist_pos.ksh \
        tst.return_recursive_table.ksh \
+       tst.timeout.ksh
+
+dist_pkgdata_DATA = \
+       tst.args_to_lua.out \
+       tst.args_to_lua.zcp \
+       tst.divide_by_zero.err \
+       tst.divide_by_zero.zcp \
+       tst.exists.zcp \
+       tst.large_prog.out \
+       tst.large_prog.zcp \
+       tst.lib_base.lua \
+       tst.lib_coroutine.lua \
+       tst.lib_strings.lua \
+       tst.lib_table.lua \
+       tst.nested_neg.zcp \
+       tst.nested_pos.zcp \
+       tst.recursive.zcp \
+       tst.return_large.zcp \
        tst.return_recursive_table.zcp \
-       tst.timeout.ksh \
        tst.timeout.zcp

diff --git a/tests/zfs-tests/tests/functional/channel_program/synctask_core/Makefile.am b/tests/zfs-tests/tests/functional/channel_program/synctask_core/Makefile.am
index 93ec25a03b3c9199352fffd15688f47026677236..7bdaf53de2fa9a4640796e5bf0ce4844f4120989 100644 (file)
--- a/tests/zfs-tests/tests/functional/channel_program/synctask_core/Makefile.am
+++ b/tests/zfs-tests/tests/functional/channel_program/synctask_core/Makefile.am
@@ -6,16 +6,10 @@ dist_pkgdata_SCRIPTS = \
        tst.destroy_snap.ksh \
        tst.get_count_and_limit.ksh \
        tst.get_index_props.ksh \
-       tst.get_index_props.out \
-       tst.get_index_props.zcp \
        tst.get_mountpoint.ksh \
        tst.get_neg.ksh \
        tst.get_number_props.ksh \
-       tst.get_number_props.out \
-       tst.get_number_props.zcp \
        tst.get_string_props.ksh \
-       tst.get_string_props.out \
-       tst.get_string_props.zcp \
        tst.get_type.ksh \
        tst.get_userquota.ksh \
        tst.get_written.ksh \
@@ -26,16 +20,24 @@ dist_pkgdata_SCRIPTS = \
        tst.list_user_props.ksh \
        tst.parse_args_neg.ksh \
        tst.promote_conflict.ksh \
-       tst.promote_conflict.zcp \
        tst.promote_multiple.ksh \
        tst.promote_simple.ksh \
        tst.rollback_mult.ksh \
        tst.rollback_one.ksh \
        tst.snapshot_destroy.ksh \
-       tst.snapshot_destroy.zcp \
        tst.snapshot_neg.ksh \
-       tst.snapshot_neg.zcp \
        tst.snapshot_recursive.ksh \
+       tst.snapshot_simple.ksh
+
+dist_pkgdata_DATA = \
+       tst.get_index_props.out \
+       tst.get_index_props.zcp \
+       tst.get_number_props.out \
+       tst.get_number_props.zcp \
+       tst.get_string_props.out \
+       tst.get_string_props.zcp \
+       tst.promote_conflict.zcp \
+       tst.snapshot_destroy.zcp \
+       tst.snapshot_neg.zcp \
        tst.snapshot_recursive.zcp \
-       tst.snapshot_simple.ksh \
        tst.snapshot_simple.zcp

diff --git a/tests/zfs-tests/tests/functional/checksum/Makefile.am b/tests/zfs-tests/tests/functional/checksum/Makefile.am
index cacb3c92785c6f7f287e555fc815c4733868b58c..f72546b22590f69d37d2cbdb93d83c6b57897d3c 100644 (file)
--- a/tests/zfs-tests/tests/functional/checksum/Makefile.am
+++ b/tests/zfs-tests/tests/functional/checksum/Makefile.am
@@ -8,7 +8,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/checksum
 
 dist_pkgdata_SCRIPTS = \
-       default.cfg \
        setup.ksh \
        cleanup.ksh \
        run_edonr_test.ksh \
@@ -16,6 +15,9 @@ dist_pkgdata_SCRIPTS = \
        run_skein_test.ksh \
        filetest_001_pos.ksh
 
+dist_pkgdata_DATA = \
+       default.cfg
+
 pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/checksum
 
 pkgexec_PROGRAMS = \

diff --git a/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am b/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am
index 2e37147bf7c93694b719e3061cd0947840a4d1b5..2bc67709fffb3752c54ecf2efbb7e2b5017266f7 100644 (file)
--- a/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am
+++ b/tests/zfs-tests/tests/functional/clean_mirror/Makefile.am
@@ -1,10 +1,12 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/clean_mirror
 dist_pkgdata_SCRIPTS = \
-       clean_mirror_common.kshlib \
-       default.cfg \
         cleanup.ksh \
        setup.ksh \
        clean_mirror_001_pos.ksh \
        clean_mirror_002_pos.ksh \
        clean_mirror_003_pos.ksh \
        clean_mirror_004_pos.ksh
+
+dist_pkgdata_DATA = \
+       clean_mirror_common.kshlib \
+       default.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/Makefile.am
index a7c56b6656bc1acedc39ef3f8f7ea4efe95ce3c5..7ded5f41f5fb49ec2e42ae17b047471fb01f2f42 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root
-dist_pkgdata_SCRIPTS = \
+dist_pkgdata_DATA = \
        cli_common.kshlib
 
 SUBDIRS = \

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am
index 732126de78e044d6234d411680737864d001a622..4ac103a8ec6aac938e28d80c07422c0c5e762ba8 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_copies
 dist_pkgdata_SCRIPTS = \
-       zfs_copies.cfg \
-       zfs_copies.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_copies_001_pos.ksh \
@@ -10,3 +8,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_copies_004_neg.ksh \
        zfs_copies_005_neg.ksh \
        zfs_copies_006_pos.ksh
+
+dist_pkgdata_DATA = \
+       zfs_copies.cfg \
+       zfs_copies.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am
index dd6dde3170f63abe122bf6b70c60bc42dd03d578..a36d021614237150355ad201a81541d7efd000b9 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile.am
@@ -1,8 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_create
 dist_pkgdata_SCRIPTS = \
-       properties.kshlib \
-       zfs_create_common.kshlib \
-       zfs_create.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_create_001_pos.ksh \
@@ -21,3 +18,8 @@ dist_pkgdata_SCRIPTS = \
        zfs_create_014_pos.ksh \
        zfs_create_encrypted.ksh \
        zfs_create_crypt_combos.ksh
+
+dist_pkgdata_DATA = \
+       properties.kshlib \
+       zfs_create_common.kshlib \
+       zfs_create.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am
index 5a4bd70ceab49a57db3b64cd0377b2886aca5aec..183578df5d3843e709c268ef8e5ff799f3d9cc07 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_destroy
 dist_pkgdata_SCRIPTS = \
-       zfs_destroy_common.kshlib \
-       zfs_destroy.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_destroy_001_pos.ksh \
@@ -20,3 +18,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_destroy_014_pos.ksh \
        zfs_destroy_015_pos.ksh \
        zfs_destroy_016_pos.ksh
+
+dist_pkgdata_DATA = \
+       zfs_destroy_common.kshlib \
+       zfs_destroy.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am
index 880a845af40c60ae7bcb45bdf26ee6dd403df65d..22e95907675daca4357b1a8b98fec449b4af13f4 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_get
 dist_pkgdata_SCRIPTS = \
-       zfs_get_common.kshlib \
-       zfs_get_list_d.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_get_001_pos.ksh \
@@ -14,3 +12,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_get_008_pos.ksh \
        zfs_get_009_pos.ksh \
        zfs_get_010_neg.ksh
+
+dist_pkgdata_DATA = \
+       zfs_get_common.kshlib \
+       zfs_get_list_d.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile.am
index 1de907168bb88ad361462a94996ec1581a93fdd4..aaecb9730c523b110f12ad96314adba1a72fb87e 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_load-key
 dist_pkgdata_SCRIPTS = \
-       zfs_load-key.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_load-key_common.kshlib \
@@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_load-key_location.ksh \
        zfs_load-key_noop.ksh \
        zfs_load-key_recursive.ksh
+
+dist_pkgdata_DATA = \
+       zfs_load-key.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
index 85090a534c1e56d3493df4f8bbef13fc367785d5..b0d4e946979588304cf18f2ac6772f5d06d2d77d 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_mount
 dist_pkgdata_SCRIPTS = \
-       zfs_mount.cfg \
-       zfs_mount.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_mount_001_pos.ksh \
@@ -19,3 +17,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_mount_encrypted.ksh \
        zfs_mount_all_001_pos.ksh \
        zfs_mount_remount.ksh
+
+dist_pkgdata_DATA = \
+       zfs_mount.cfg \
+       zfs_mount.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am
index d51f222fe6be716f16dae3e27124ad63554e647b..8a8c56a093d2a4db3021c3a1685cb8e1c107fbdd 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_promote
 dist_pkgdata_SCRIPTS = \
-       zfs_promote.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_promote_001_pos.ksh \
@@ -12,3 +11,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_promote_007_neg.ksh \
        zfs_promote_008_pos.ksh \
        zfs_promote_encryptionroot.ksh
+
+dist_pkgdata_DATA = \
+       zfs_promote.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am
index dfef661b75f7d68ba28f585659d666f4aa4a1c86..352d6d5fe08ad6e09f427af3f0a3525406a0cfd8 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_rename
 dist_pkgdata_SCRIPTS = \
-       zfs_rename.cfg \
-       zfs_rename.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_rename_001_pos.ksh \
@@ -19,3 +17,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_rename_013_pos.ksh \
        zfs_rename_encrypted_child.ksh \
        zfs_rename_to_encrypted.ksh
+
+dist_pkgdata_DATA = \
+       zfs_rename.cfg \
+       zfs_rename.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am
index 857959b2a086c63aa6e3610bb769a583bb96b1dd..4d278f724527cc50b51331c8ef92c71214f94c25 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile.am
@@ -1,10 +1,12 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_rollback
 dist_pkgdata_SCRIPTS = \
-       zfs_rollback.cfg \
-       zfs_rollback_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_rollback_001_pos.ksh \
        zfs_rollback_002_pos.ksh \
        zfs_rollback_003_neg.ksh \
        zfs_rollback_004_neg.ksh
+
+dist_pkgdata_DATA = \
+       zfs_rollback.cfg \
+       zfs_rollback_common.kshlib

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 682569da48bbabf33bc8a7777af3468331a79ec7..2a476f3dce44800bdb74da2f99c889dc64c2924d 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_send
 dist_pkgdata_SCRIPTS = \
-       zfs_send.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_send_001_pos.ksh \
@@ -14,3 +13,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_send_raw.ksh \
        zfs_send_sparse.ksh \
        zfs_send-b.ksh
+
+dist_pkgdata_DATA = \
+       zfs_send.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am
index 2a9e858e034f4995c7ccec6d30ece1a6789b2112..015464bf47726d1f6069345283f0eb0773a182f9 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_set
 dist_pkgdata_SCRIPTS = \
-       zfs_set_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        cache_001_pos.ksh \
@@ -30,3 +29,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_set_002_neg.ksh \
        zfs_set_003_neg.ksh \
        zfs_set_keylocation.ksh
+
+dist_pkgdata_DATA = \
+       zfs_set_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am
index 926531b4e20bc64d8f96255f5f0b9eaa055d2a87..e2001465693307848c8e190749915366a1c4e7c0 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_share
 dist_pkgdata_SCRIPTS = \
-       zfs_share.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_share_001_pos.ksh \
@@ -14,3 +13,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_share_009_neg.ksh \
        zfs_share_010_neg.ksh \
        zfs_share_011_pos.ksh
+
+dist_pkgdata_DATA = \
+       zfs_share.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am
index fd1db079761e9b5f2112a3b3713f935e3b55289b..bc5b801259c8c113d9c6a41796a4c2ecc78c516a 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_snapshot
 dist_pkgdata_SCRIPTS = \
-       zfs_snapshot.cfg \
        setup.ksh \
        cleanup.ksh \
        zfs_snapshot_001_neg.ksh \
@@ -12,3 +11,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_snapshot_007_neg.ksh \
        zfs_snapshot_008_neg.ksh \
        zfs_snapshot_009_pos.ksh
+
+dist_pkgdata_DATA = \
+       zfs_snapshot.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am
index 57a780872d8bb3175d18324550a366b67d9316ba..9ea809f26efbcb59d630b19205c28a46514529f9 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_unmount
 dist_pkgdata_SCRIPTS = \
-       zfs_unmount.cfg \
-       zfs_unmount.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_unmount_001_pos.ksh \
@@ -14,3 +12,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_unmount_008_neg.ksh \
        zfs_unmount_009_pos.ksh \
        zfs_unmount_all_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       zfs_unmount.cfg \
+       zfs_unmount.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am
index cd7a452893ded79e6bc463e97328a610defb0229..7a71bae4bb42d5c82c44aadf8485ac74ebf7fc03 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_upgrade
 dist_pkgdata_SCRIPTS = \
-       zfs_upgrade.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_upgrade_001_pos.ksh \
@@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \
        zfs_upgrade_005_pos.ksh \
        zfs_upgrade_006_neg.ksh \
        zfs_upgrade_007_neg.ksh
+
+dist_pkgdata_DATA = \
+       zfs_upgrade.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am
index 0620282992d5a0d78f94bf3d40c5360fb6913e2c..a7f62b6f9f794e4f6bbe3d2c7eb1624c552fcce2 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_add
 dist_pkgdata_SCRIPTS = \
-       zpool_add.cfg \
-       zpool_add.kshlib \
        setup.ksh \
        cleanup.ksh \
        zpool_add_001_pos.ksh \
@@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \
        add-o_ashift.ksh \
        add_prop_ashift.ksh \
        add_nested_replacing_spare.ksh
+
+dist_pkgdata_DATA = \
+       zpool_add.cfg \
+       zpool_add.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am
index cfd4534c9c40e7f598ba0e137be65c776256eddd..6986d38efc9d7d6f29d6107fb2e2318e0839f3b5 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile.am
@@ -1,9 +1,11 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_clear
 dist_pkgdata_SCRIPTS = \
-       zpool_clear.cfg \
        setup.ksh \
        cleanup.ksh \
        zpool_clear_001_pos.ksh \
        zpool_clear_002_neg.ksh \
        zpool_clear_003_neg.ksh \
        zpool_clear_readonly.ksh
+
+dist_pkgdata_DATA = \
+       zpool_clear.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
index e2b84bca5d34f66953c942bd3df42cd185f88b8c..89b36fa99097b0f4c53282477520269707a45e51 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_create
 dist_pkgdata_SCRIPTS = \
-       zpool_create.cfg \
-       zpool_create.shlib \
        setup.ksh \
        cleanup.ksh \
        zpool_create_001_pos.ksh \
@@ -35,3 +33,7 @@ dist_pkgdata_SCRIPTS = \
        zpool_create_features_004_neg.ksh \
        zpool_create_features_005_pos.ksh \
        create-o_ashift.ksh
+
+dist_pkgdata_DATA = \
+       zpool_create.cfg \
+       zpool_create.shlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am
index 5130bcc3f5715a555811b810fab4c118fac186e0..7f9e00d5826f2f54c9aacbd8ac4d42afe9b0fdb8 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile.am
@@ -1,6 +1,8 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_destroy
 dist_pkgdata_SCRIPTS = \
-       zpool_destroy.cfg \
        zpool_destroy_001_pos.ksh \
        zpool_destroy_002_pos.ksh \
        zpool_destroy_003_neg.ksh
+
+dist_pkgdata_DATA = \
+       zpool_destroy.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am
index 672261718284a1d4797294afae50d9bacb3047de..2fae015b53ba7d369f396b8b831c53795b7ecae3 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile.am
@@ -1,9 +1,11 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_expand
 dist_pkgdata_SCRIPTS = \
-       zpool_expand.cfg \
        setup.ksh \
        cleanup.ksh \
        zpool_expand_001_pos.ksh \
        zpool_expand_002_pos.ksh \
        zpool_expand_003_neg.ksh \
        zpool_expand_004_pos.ksh
+
+dist_pkgdata_DATA = \
+       zpool_expand.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am
index d0af877f3a68aa8de5b96b356149454a03e736c7..86452e8acc6e93d870e1101404620aa5febdfd79 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile.am
@@ -2,8 +2,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_expo
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       zpool_export.cfg \
        zpool_export_001_pos.ksh \
        zpool_export_002_pos.ksh \
        zpool_export_003_neg.ksh \
        zpool_export_004_pos.ksh
+
+dist_pkgdata_DATA = \
+       zpool_export.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am
index bc42ee403ba069f2ee500f426737653131289a62..36a7f23126a4d51dd48d83da49e2a9d1d0e41529 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile.am
@@ -1,9 +1,11 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_get
 dist_pkgdata_SCRIPTS = \
-       zpool_get.cfg \
        setup.ksh \
        cleanup.ksh \
        zpool_get_001_pos.ksh \
        zpool_get_002_pos.ksh \
        zpool_get_003_pos.ksh \
        zpool_get_004_neg.ksh
+
+dist_pkgdata_DATA = \
+       zpool_get.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am
index 6200af247b66f035583ffc3678bbb7398cbc24be..8aa34f33cc83cfa4efca91fbbaa8b8cdff03c0cd 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_import
 dist_pkgdata_SCRIPTS = \
-       zpool_import.cfg \
        setup.ksh \
        cleanup.ksh \
        zpool_import_001_pos.ksh \
@@ -34,5 +33,7 @@ BLOCKFILES = \
        unclean_export.dat.bz2 \
        cryptv0.dat.bz2
 
-dist_pkgdata_DATA = $(BLOCKFILES)
+dist_pkgdata_DATA = $(BLOCKFILES) \
+       zpool_import.cfg
+
 EXTRA_DIST = $(BLOCKFILES)

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am
index 9890265c37f58a703b5ccb1e383a552941a70cd6..e30e3f60c2d62bf52e09e5cd75fb093397d57631 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile.am
@@ -1,8 +1,10 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_remove
 dist_pkgdata_SCRIPTS = \
-       zpool_remove.cfg \
        setup.ksh \
        cleanup.ksh \
        zpool_remove_001_neg.ksh \
        zpool_remove_002_pos.ksh \
        zpool_remove_003_pos.ksh
+
+dist_pkgdata_DATA = \
+       zpool_remove.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/Makefile.am
index 26de288a8e3150a07912f91747fe29d5f62aa031..f4686c04e2e3fb1593fed8c4823aef403f7359b4 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/Makefile.am
@@ -2,11 +2,13 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_reop
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       zpool_reopen.cfg \
-       zpool_reopen.shlib \
        zpool_reopen_001_pos.ksh \
        zpool_reopen_002_pos.ksh \
        zpool_reopen_003_pos.ksh \
        zpool_reopen_004_pos.ksh \
        zpool_reopen_005_pos.ksh \
        zpool_reopen_006_neg.ksh
+
+dist_pkgdata_DATA = \
+       zpool_reopen.cfg \
+       zpool_reopen.shlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am
index 5b0d3978eee5f746a9dbac3f790bdc54a4272ed3..3f4dd120709fd558def4a8d919dba75ebda2f8e6 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_scrub
 dist_pkgdata_SCRIPTS = \
-       zpool_scrub.cfg \
        setup.ksh \
        cleanup.ksh \
        zpool_scrub_001_neg.ksh \
@@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \
        zpool_scrub_005_pos.ksh \
        zpool_scrub_encrypted_unloaded.ksh \
        zpool_scrub_offline_device.ksh
+
+dist_pkgdata_DATA = \
+       zpool_scrub.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
index 71cdb29a1ded2349f1372e5c1c55778a54a1137c..1b08f4879a706a603110a6107f709c32344a4e2e 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_upgrade
 dist_pkgdata_SCRIPTS = \
-       zpool_upgrade.cfg \
-       zpool_upgrade.kshlib \
        setup.ksh \
        cleanup.ksh \
        zpool_upgrade_001_pos.ksh \
@@ -68,5 +66,8 @@ BLOCKFILES = \
        zfs-pool-v999.dat.bz2 \
        zfs-pool-vBROKEN.dat.bz2
 
-dist_pkgdata_DATA = $(BLOCKFILES)
+dist_pkgdata_DATA = $(BLOCKFILES) \
+       zpool_upgrade.cfg \
+       zpool_upgrade.kshlib
+
 EXTRA_DIST = $(BLOCKFILES)

diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am
index e1b52a1a3c8c939b0ea7a24ff49fa35ef1d5aea3..ff7b4906fe3a52edb9b4db4ac6dda39a605bbb8d 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_user/misc
 dist_pkgdata_SCRIPTS = \
-       misc.cfg \
        setup.ksh \
        cleanup.ksh \
        zdb_001_neg.ksh \
@@ -49,3 +48,6 @@ dist_pkgdata_SCRIPTS = \
        arc_summary_002_neg.ksh \
        arc_summary3_001_pos.ksh \
        dbufstat_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       misc.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am b/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am
index 34390af64266409ca7eb7f8136510df66e82d456..8393072af22593425d59ee5e065ea9adc84553a1 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_user/zfs_list
 dist_pkgdata_SCRIPTS = \
-       zfs_list.cfg \
-       zfs_list.kshlib \
        setup.ksh \
        cleanup.ksh \
        zfs_list_001_pos.ksh \
@@ -10,3 +8,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_list_004_neg.ksh \
        zfs_list_007_pos.ksh \
        zfs_list_008_neg.ksh
+
+dist_pkgdata_DATA = \
+       zfs_list.cfg \
+       zfs_list.kshlib

diff --git a/tests/zfs-tests/tests/functional/compression/Makefile.am b/tests/zfs-tests/tests/functional/compression/Makefile.am
index d11b0a7a1fbe45a72f46235b6b2af9acbe4bdf5d..25a5bca232f139bc3b9453661fae030cadba9cf5 100644 (file)
--- a/tests/zfs-tests/tests/functional/compression/Makefile.am
+++ b/tests/zfs-tests/tests/functional/compression/Makefile.am
@@ -1,9 +1,11 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/compression
 dist_pkgdata_SCRIPTS = \
-       compress.cfg \
        cleanup.ksh \
        setup.ksh \
        compress_001_pos.ksh \
        compress_002_pos.ksh \
        compress_003_pos.ksh \
        compress_004_pos.ksh
+
+dist_pkgdata_DATA = \
+       compress.cfg

diff --git a/tests/zfs-tests/tests/functional/deadman/Makefile.am b/tests/zfs-tests/tests/functional/deadman/Makefile.am
index 9c4b0713cf5e2e10ce8eed97a63bf00dfcc55059..7b70ca09df560569c3d18eda4ce419fd9b736c72 100644 (file)
--- a/tests/zfs-tests/tests/functional/deadman/Makefile.am
+++ b/tests/zfs-tests/tests/functional/deadman/Makefile.am
@@ -1,5 +1,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/deadman
 dist_pkgdata_SCRIPTS = \
-       deadman.cfg \
        deadman_sync.ksh \
        deadman_zio.ksh
+
+dist_pkgdata_DATA = \
+       deadman.cfg

diff --git a/tests/zfs-tests/tests/functional/delegate/Makefile.am b/tests/zfs-tests/tests/functional/delegate/Makefile.am
index 6ccd65d53b1c6ec5591823b98030485c14b38478..c33da3374d88b66060a92275eaa1728a7e2461fd 100644 (file)
--- a/tests/zfs-tests/tests/functional/delegate/Makefile.am
+++ b/tests/zfs-tests/tests/functional/delegate/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/delegate
 dist_pkgdata_SCRIPTS = \
-       delegate.cfg \
-       delegate_common.kshlib \
        cleanup.ksh \
        setup.ksh \
        zfs_allow_001_pos.ksh \
@@ -24,3 +22,7 @@ dist_pkgdata_SCRIPTS = \
        zfs_unallow_006_pos.ksh \
        zfs_unallow_007_neg.ksh \
        zfs_unallow_008_neg.ksh
+
+dist_pkgdata_DATA = \
+       delegate.cfg \
+       delegate_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/devices/Makefile.am b/tests/zfs-tests/tests/functional/devices/Makefile.am
index ebbfa9aba7178a32c0b63f0ad0f3f0e2b345d43a..42f59428d4ca60af7586d444caeff324571bc8fe 100644 (file)
--- a/tests/zfs-tests/tests/functional/devices/Makefile.am
+++ b/tests/zfs-tests/tests/functional/devices/Makefile.am
@@ -1,9 +1,11 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/devices
 dist_pkgdata_SCRIPTS = \
-       devices.cfg \
-       devices_common.kshlib \
        cleanup.ksh \
        setup.ksh \
        devices_001_pos.ksh \
        devices_002_neg.ksh \
        devices_003_pos.ksh
+
+dist_pkgdata_DATA = \
+       devices.cfg \
+       devices_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/events/Makefile.am b/tests/zfs-tests/tests/functional/events/Makefile.am
index 415e44b6baffe7ff94ca4ac26fd8d95ff0352d66..e1fe490812b35e79298075d7e3c0f2fe0907a3b2 100644 (file)
--- a/tests/zfs-tests/tests/functional/events/Makefile.am
+++ b/tests/zfs-tests/tests/functional/events/Makefile.am
@@ -2,8 +2,10 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/events
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       events.cfg \
-       events_common.kshlib \
        events_001_pos.ksh \
        events_002_pos.ksh \
        zed_rc_filter.ksh
+
+dist_pkgdata_DATA = \
+       events.cfg \
+       events_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/grow_pool/Makefile.am b/tests/zfs-tests/tests/functional/grow_pool/Makefile.am
index cdad61757f4a4f68e4fb8ff42e5a8565f23e9651..1e5ba31b9349b8f3a41dfc347fd8a0774faa388d 100644 (file)
--- a/tests/zfs-tests/tests/functional/grow_pool/Makefile.am
+++ b/tests/zfs-tests/tests/functional/grow_pool/Makefile.am
@@ -2,5 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/grow_pool
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       grow_pool.cfg \
        grow_pool_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       grow_pool.cfg

diff --git a/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am b/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am
index 7fdcd952d0d045202172f9eba59eb7526081fc71..bd8ccd0eb325846156a2a33cc63d239ad5d1851d 100644 (file)
--- a/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am
+++ b/tests/zfs-tests/tests/functional/grow_replicas/Makefile.am
@@ -1,4 +1,6 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/grow_replicas
 dist_pkgdata_SCRIPTS = \
-       grow_replicas.cfg \
        grow_replicas_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       grow_replicas.cfg

diff --git a/tests/zfs-tests/tests/functional/history/Makefile.am b/tests/zfs-tests/tests/functional/history/Makefile.am
index 861f4129941d3a988d8806d9d1cabed431a0d1da..b865a319a430a0df1e2a038cc4143639fd8a09b3 100644 (file)
--- a/tests/zfs-tests/tests/functional/history/Makefile.am
+++ b/tests/zfs-tests/tests/functional/history/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/history
 dist_pkgdata_SCRIPTS = \
-       history.cfg \
-       history_common.kshlib \
        cleanup.ksh \
        setup.ksh \
        history_001_pos.ksh \
@@ -13,7 +11,11 @@ dist_pkgdata_SCRIPTS = \
        history_007_pos.ksh \
        history_008_pos.ksh \
        history_009_pos.ksh \
-       history_010_pos.ksh \
+       history_010_pos.ksh
+
+dist_pkgdata_DATA = \
+       history.cfg \
+       history_common.kshlib \
        i386.migratedpool.DAT.Z \
        i386.orig_history.txt \
        sparc.migratedpool.DAT.Z \

diff --git a/tests/zfs-tests/tests/functional/inheritance/Makefile.am b/tests/zfs-tests/tests/functional/inheritance/Makefile.am
index d07e2b1104537842bdd6aae5e6b933964fff321a..82de708d631c7cc0b4f1052b71f34710be90e605 100644 (file)
--- a/tests/zfs-tests/tests/functional/inheritance/Makefile.am
+++ b/tests/zfs-tests/tests/functional/inheritance/Makefile.am
@@ -1,8 +1,10 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/inheritance
 dist_pkgdata_SCRIPTS = \
-       inherit.kshlib \
        cleanup.ksh \
-       inherit_001_pos.ksh \
+       inherit_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       inherit.kshlib \
        config001.cfg \
        config002.cfg \
        config003.cfg \

diff --git a/tests/zfs-tests/tests/functional/inuse/Makefile.am b/tests/zfs-tests/tests/functional/inuse/Makefile.am
index efc00eacdfb556b3075add66e1d1c7378121ba1f..c541e57eaa3107c6b35bf0d47a8b578105752395 100644 (file)
--- a/tests/zfs-tests/tests/functional/inuse/Makefile.am
+++ b/tests/zfs-tests/tests/functional/inuse/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/inuse
 dist_pkgdata_SCRIPTS = \
-       inuse.cfg \
        setup.ksh \
        inuse_001_pos.ksh \
        inuse_003_pos.ksh \
@@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \
        inuse_007_pos.ksh \
        inuse_008_pos.ksh \
        inuse_009_pos.ksh
+
+dist_pkgdata_DATA = \
+       inuse.cfg

diff --git a/tests/zfs-tests/tests/functional/largest_pool/Makefile.am b/tests/zfs-tests/tests/functional/largest_pool/Makefile.am
index 474a15ab17a26568f64dbefd91f804edacd14559..5f1473dede7031fcc6ae8e4d3800876b9fef6da4 100644 (file)
--- a/tests/zfs-tests/tests/functional/largest_pool/Makefile.am
+++ b/tests/zfs-tests/tests/functional/largest_pool/Makefile.am
@@ -1,4 +1,6 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/largest_pool
 dist_pkgdata_SCRIPTS = \
-       largest_pool.cfg \
        largest_pool_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       largest_pool.cfg

diff --git a/tests/zfs-tests/tests/functional/migration/Makefile.am b/tests/zfs-tests/tests/functional/migration/Makefile.am
index 53fb30bc1be3e63153248ddca75bab537c18b6f5..9c4f244156ce2182f026f204df569f57ccbfeb5b 100644 (file)
--- a/tests/zfs-tests/tests/functional/migration/Makefile.am
+++ b/tests/zfs-tests/tests/functional/migration/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/migration
 dist_pkgdata_SCRIPTS = \
-       migration.cfg \
-       migration.kshlib \
        setup.ksh \
        cleanup.ksh \
        migration_001_pos.ksh \
@@ -16,3 +14,7 @@ dist_pkgdata_SCRIPTS = \
        migration_010_pos.ksh \
        migration_011_pos.ksh \
        migration_012_pos.ksh
+
+dist_pkgdata_DATA = \
+       migration.cfg \
+       migration.kshlib

diff --git a/tests/zfs-tests/tests/functional/mmap/Makefile.am b/tests/zfs-tests/tests/functional/mmap/Makefile.am
index 4e1db6041f41d7cdc2897073b71a878a9d9684a9..2adc398b8c099be72ce49559c8c3c6314d0dfdef 100644 (file)
--- a/tests/zfs-tests/tests/functional/mmap/Makefile.am
+++ b/tests/zfs-tests/tests/functional/mmap/Makefile.am
@@ -2,7 +2,9 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mmap
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       mmap.cfg \
        mmap_read_001_pos.ksh \
        mmap_write_001_pos.ksh \
        mmap_libaio_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       mmap.cfg

diff --git a/tests/zfs-tests/tests/functional/mmp/Makefile.am b/tests/zfs-tests/tests/functional/mmp/Makefile.am
index bb42880381309ba8e7c119f02c07c38541b1c78e..ecf16f806df66a46ba8ec51bd27d366660cb691f 100644 (file)
--- a/tests/zfs-tests/tests/functional/mmp/Makefile.am
+++ b/tests/zfs-tests/tests/functional/mmp/Makefile.am
@@ -11,6 +11,8 @@ dist_pkgdata_SCRIPTS = \
        mmp_write_uberblocks.ksh \
        mmp_reset_interval.ksh \
        setup.ksh \
-       cleanup.ksh \
+       cleanup.ksh
+
+dist_pkgdata_DATA = \
        mmp.kshlib \
        mmp.cfg

diff --git a/tests/zfs-tests/tests/functional/mv_files/Makefile.am b/tests/zfs-tests/tests/functional/mv_files/Makefile.am
index 574af156c609103f20664c08426580ce4449f5e1..16a9c65eb5f411781f21c5c7b4fedf9762c8c662 100644 (file)
--- a/tests/zfs-tests/tests/functional/mv_files/Makefile.am
+++ b/tests/zfs-tests/tests/functional/mv_files/Makefile.am
@@ -1,8 +1,10 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mv_files
 dist_pkgdata_SCRIPTS = \
-       mv_files.cfg \
-       mv_files_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        mv_files_001_pos.ksh \
        mv_files_002_pos.ksh
+
+dist_pkgdata_DATA = \
+       mv_files.cfg \
+       mv_files_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/no_space/Makefile.am b/tests/zfs-tests/tests/functional/no_space/Makefile.am
index ac92882c07bea9c7fb0243ce6522a3887ecf7e82..a5b042b23ad0504b01e83914a3eb3785691bb3b3 100644 (file)
--- a/tests/zfs-tests/tests/functional/no_space/Makefile.am
+++ b/tests/zfs-tests/tests/functional/no_space/Makefile.am
@@ -1,8 +1,10 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/no_space
 dist_pkgdata_SCRIPTS = \
-       enospc.cfg \
        setup.ksh \
        cleanup.ksh \
        enospc_001_pos.ksh \
        enospc_002_pos.ksh \
        enospc_003_pos.ksh
+
+dist_pkgdata_DATA = \
+       enospc.cfg

diff --git a/tests/zfs-tests/tests/functional/nopwrite/Makefile.am b/tests/zfs-tests/tests/functional/nopwrite/Makefile.am
index c7c90e3670a201d23427614b1bd491b023167c00..3f893c6382e66f955e664ca0fa6f52cd4a8432a6 100644 (file)
--- a/tests/zfs-tests/tests/functional/nopwrite/Makefile.am
+++ b/tests/zfs-tests/tests/functional/nopwrite/Makefile.am
@@ -2,7 +2,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/nopwrite
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       nopwrite.shlib \
        nopwrite_copies.ksh \
        nopwrite_mtime.ksh \
        nopwrite_negative.ksh \
@@ -11,3 +10,6 @@ dist_pkgdata_SCRIPTS = \
        nopwrite_sync.ksh \
        nopwrite_varying_compression.ksh \
        nopwrite_volume.ksh
+
+dist_pkgdata_DATA = \
+       nopwrite.shlib

diff --git a/tests/zfs-tests/tests/functional/online_offline/Makefile.am b/tests/zfs-tests/tests/functional/online_offline/Makefile.am
index 9562ba5b10e51fbbb49e6fa698567212fe7f17cc..bd23f89e538a6bac7fb3647123e78705cb72f327 100644 (file)
--- a/tests/zfs-tests/tests/functional/online_offline/Makefile.am
+++ b/tests/zfs-tests/tests/functional/online_offline/Makefile.am
@@ -1,8 +1,10 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/online_offline
 dist_pkgdata_SCRIPTS = \
-       online_offline.cfg \
        setup.ksh \
        cleanup.ksh \
        online_offline_001_pos.ksh \
        online_offline_002_neg.ksh \
        online_offline_003_neg.ksh
+
+dist_pkgdata_DATA = \
+       online_offline.cfg

diff --git a/tests/zfs-tests/tests/functional/projectquota/Makefile.am b/tests/zfs-tests/tests/functional/projectquota/Makefile.am
index 4abfda0d2a81574d779e3ca0acd4b1a16f9dc5cd..e98c8672802e835fc1e5a74455d52975267f50be 100644 (file)
--- a/tests/zfs-tests/tests/functional/projectquota/Makefile.am
+++ b/tests/zfs-tests/tests/functional/projectquota/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/projectquota
 dist_pkgdata_SCRIPTS = \
-       projectquota.cfg \
-       projectquota_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        projectid_001_pos.ksh \
@@ -23,3 +21,7 @@ dist_pkgdata_SCRIPTS = \
        projecttree_001_pos.ksh \
        projecttree_002_pos.ksh \
        projecttree_003_neg.ksh
+
+dist_pkgdata_DATA = \
+       projectquota.cfg \
+       projectquota_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/quota/Makefile.am b/tests/zfs-tests/tests/functional/quota/Makefile.am
index 6318684197844408084498778a2b5bfe3f82dfc1..ba18bff7ecb72bdfa5adbc6653f006a85431aff6 100644 (file)
--- a/tests/zfs-tests/tests/functional/quota/Makefile.am
+++ b/tests/zfs-tests/tests/functional/quota/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/quota
 dist_pkgdata_SCRIPTS = \
-       quota.cfg \
-       quota.kshlib \
        setup.ksh \
        cleanup.ksh \
        quota_001_pos.ksh \
@@ -10,3 +8,7 @@ dist_pkgdata_SCRIPTS = \
        quota_004_pos.ksh \
        quota_005_pos.ksh \
        quota_006_neg.ksh
+
+dist_pkgdata_DATA = \
+       quota.cfg \
+       quota.kshlib

diff --git a/tests/zfs-tests/tests/functional/redundancy/Makefile.am b/tests/zfs-tests/tests/functional/redundancy/Makefile.am
index ef7dd91a3a45cb8514f2f0c7f9a48cac976d0aec..6f6cc405b9bf59cad9d38af8bb151ec9e0807243 100644 (file)
--- a/tests/zfs-tests/tests/functional/redundancy/Makefile.am
+++ b/tests/zfs-tests/tests/functional/redundancy/Makefile.am
@@ -1,10 +1,12 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/redundancy
 dist_pkgdata_SCRIPTS = \
-       redundancy.cfg \
-       redundancy.kshlib \
        setup.ksh \
        cleanup.ksh \
        redundancy_001_pos.ksh \
        redundancy_002_pos.ksh \
        redundancy_003_pos.ksh \
        redundancy_004_neg.ksh
+
+dist_pkgdata_DATA = \
+       redundancy.cfg \
+       redundancy.kshlib

diff --git a/tests/zfs-tests/tests/functional/refreserv/Makefile.am b/tests/zfs-tests/tests/functional/refreserv/Makefile.am
index 41c88a6cbdf43c3315c595d12c586f2ca7f35760..96f25d444e67615a08ba39d1cca46abaf01b7039 100644 (file)
--- a/tests/zfs-tests/tests/functional/refreserv/Makefile.am
+++ b/tests/zfs-tests/tests/functional/refreserv/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/refreserv
 dist_pkgdata_SCRIPTS = \
-       refreserv.cfg \
        setup.ksh \
        cleanup.ksh \
        refreserv_001_pos.ksh \
@@ -8,3 +7,6 @@ dist_pkgdata_SCRIPTS = \
        refreserv_003_pos.ksh \
        refreserv_004_pos.ksh \
        refreserv_005_pos.ksh
+
+dist_pkgdata_DATA = \
+       refreserv.cfg

diff --git a/tests/zfs-tests/tests/functional/replacement/Makefile.am b/tests/zfs-tests/tests/functional/replacement/Makefile.am
index ff3a7dfb3d89f3b85e13e7e94ddb5e1542f00826..d47fcd5e1b24daed827b3b2561d44f3ddc506cb4 100644 (file)
--- a/tests/zfs-tests/tests/functional/replacement/Makefile.am
+++ b/tests/zfs-tests/tests/functional/replacement/Makefile.am
@@ -1,8 +1,10 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/replacement
 dist_pkgdata_SCRIPTS = \
-       replacement.cfg \
        setup.ksh \
        cleanup.ksh \
        replacement_001_pos.ksh \
        replacement_002_pos.ksh \
        replacement_003_pos.ksh
+
+dist_pkgdata_DATA = \
+       replacement.cfg

diff --git a/tests/zfs-tests/tests/functional/reservation/Makefile.am b/tests/zfs-tests/tests/functional/reservation/Makefile.am
index c346ca37cb09d408659b1f82778c6835ed0fa168..49c9f75343cd279bfba3f370377c458ea0661483 100644 (file)
--- a/tests/zfs-tests/tests/functional/reservation/Makefile.am
+++ b/tests/zfs-tests/tests/functional/reservation/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/reservation
 dist_pkgdata_SCRIPTS = \
-       reservation.cfg \
-       reservation.shlib \
        setup.ksh \
        cleanup.ksh \
        reservation_001_pos.sh \
@@ -22,3 +20,7 @@ dist_pkgdata_SCRIPTS = \
        reservation_016_pos.sh \
        reservation_017_pos.sh \
        reservation_018_pos.sh
+
+dist_pkgdata_DATA = \
+       reservation.cfg \
+       reservation.shlib

diff --git a/tests/zfs-tests/tests/functional/rsend/Makefile.am b/tests/zfs-tests/tests/functional/rsend/Makefile.am
index 7a8b8a33a474dd8002ac2a9baa8bf7e4530ed6ba..fd00d6c495017a1616f94d9abbd6d528a864fca4 100644 (file)
--- a/tests/zfs-tests/tests/functional/rsend/Makefile.am
+++ b/tests/zfs-tests/tests/functional/rsend/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/rsend
 dist_pkgdata_SCRIPTS = \
-       rsend.cfg \
-       rsend.kshlib \
        setup.ksh \
        cleanup.ksh \
        rsend_001_pos.ksh \
@@ -42,3 +40,7 @@ dist_pkgdata_SCRIPTS = \
        send-cpL_varied_recsize.ksh \
        send_freeobjects.ksh \
        send_realloc_dnode_size.ksh
+
+dist_pkgdata_DATA = \
+       rsend.cfg \
+       rsend.kshlib

diff --git a/tests/zfs-tests/tests/functional/scrub_mirror/Makefile.am b/tests/zfs-tests/tests/functional/scrub_mirror/Makefile.am
index a14d32decee1fff76aec560435897cc4320ffbb7..bc657fbf2ad915937c352d878cfac86e088d734b 100644 (file)
--- a/tests/zfs-tests/tests/functional/scrub_mirror/Makefile.am
+++ b/tests/zfs-tests/tests/functional/scrub_mirror/Makefile.am
@@ -1,10 +1,12 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/scrub_mirror
 dist_pkgdata_SCRIPTS = \
-       default.cfg \
-       scrub_mirror_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        scrub_mirror_001_pos.ksh \
        scrub_mirror_002_pos.ksh \
        scrub_mirror_003_pos.ksh \
        scrub_mirror_004_pos.ksh
+
+dist_pkgdata_DATA = \
+       default.cfg \
+       scrub_mirror_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/slog/Makefile.am b/tests/zfs-tests/tests/functional/slog/Makefile.am
index 157e6670713d808f9cf56011ae118efb9fc91e39..4548ce63b40c6b4ac56c935f8b05db89764fbaa7 100644 (file)
--- a/tests/zfs-tests/tests/functional/slog/Makefile.am
+++ b/tests/zfs-tests/tests/functional/slog/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/slog
 dist_pkgdata_SCRIPTS = \
-       slog.cfg \
-       slog.kshlib \
        setup.ksh \
        cleanup.ksh \
        slog_001_pos.ksh \
@@ -21,3 +19,7 @@ dist_pkgdata_SCRIPTS = \
        slog_015_neg.ksh \
        slog_replay_fs.ksh \
        slog_replay_volume.ksh
+
+dist_pkgdata_DATA = \
+       slog.cfg \
+       slog.kshlib

diff --git a/tests/zfs-tests/tests/functional/snapshot/Makefile.am b/tests/zfs-tests/tests/functional/snapshot/Makefile.am
index 091434d2475f5c028da0e3b46f7ff4e03c050e26..783133a643a141d90a3c269cdcd6fcab15c2d910 100644 (file)
--- a/tests/zfs-tests/tests/functional/snapshot/Makefile.am
+++ b/tests/zfs-tests/tests/functional/snapshot/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/snapshot
 dist_pkgdata_SCRIPTS = \
-       snapshot.cfg \
        setup.ksh \
        cleanup.ksh \
        clone_001_pos.ksh \
@@ -24,3 +23,6 @@ dist_pkgdata_SCRIPTS = \
        snapshot_015_pos.ksh \
        snapshot_016_pos.ksh \
        snapshot_017_pos.ksh
+
+dist_pkgdata_DATA = \
+       snapshot.cfg

diff --git a/tests/zfs-tests/tests/functional/snapused/Makefile.am b/tests/zfs-tests/tests/functional/snapused/Makefile.am
index f19320a88da91356468c07308344f4bb72cb2d46..d6551b7c41b1f55af111cff2c3708eb402375b8b 100644 (file)
--- a/tests/zfs-tests/tests/functional/snapused/Makefile.am
+++ b/tests/zfs-tests/tests/functional/snapused/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/snapused
 dist_pkgdata_SCRIPTS = \
-       snapused.kshlib \
        setup.ksh \
        cleanup.ksh \
        snapused_001_pos.ksh \
@@ -8,3 +7,6 @@ dist_pkgdata_SCRIPTS = \
        snapused_003_pos.ksh \
        snapused_004_pos.ksh \
        snapused_005_pos.ksh
+
+dist_pkgdata_DATA = \
+       snapused.kshlib

diff --git a/tests/zfs-tests/tests/functional/sparse/Makefile.am b/tests/zfs-tests/tests/functional/sparse/Makefile.am
index 33256b9251eb5f1357018df85f47a5550e2f6666..f1b9e04dcefecaa6126ae1d9926de8fd4a88e812 100644 (file)
--- a/tests/zfs-tests/tests/functional/sparse/Makefile.am
+++ b/tests/zfs-tests/tests/functional/sparse/Makefile.am
@@ -1,6 +1,8 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/sparse
 dist_pkgdata_SCRIPTS = \
-       sparse.cfg \
        setup.ksh \
        cleanup.ksh \
        sparse_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       sparse.cfg

diff --git a/tests/zfs-tests/tests/functional/truncate/Makefile.am b/tests/zfs-tests/tests/functional/truncate/Makefile.am
index 0071e8f87070d00be7557299881606003bb2f6be..b2d804b5d4c24d30f967c21a4f76a27feb0abb8e 100644 (file)
--- a/tests/zfs-tests/tests/functional/truncate/Makefile.am
+++ b/tests/zfs-tests/tests/functional/truncate/Makefile.am
@@ -5,11 +5,13 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/truncate
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       truncate.cfg \
        truncate_001_pos.ksh \
        truncate_002_pos.ksh \
        truncate_timestamps.ksh
 
+dist_pkgdata_DATA = \
+       truncate.cfg
+
 pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/truncate
 
 pkgexec_PROGRAMS = truncate_test

diff --git a/tests/zfs-tests/tests/functional/upgrade/Makefile.am b/tests/zfs-tests/tests/functional/upgrade/Makefile.am
index ee1b928465f0ad6ac1234c03fe5d615a242b661c..a774989cc69496c392976f1ba4de3f40bb8287a0 100644 (file)
--- a/tests/zfs-tests/tests/functional/upgrade/Makefile.am
+++ b/tests/zfs-tests/tests/functional/upgrade/Makefile.am
@@ -1,7 +1,9 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/upgrade
 dist_pkgdata_SCRIPTS = \
-       upgrade_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        upgrade_userobj_001_pos.ksh \
        upgrade_projectquota_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       upgrade_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/user_namespace/Makefile.am b/tests/zfs-tests/tests/functional/user_namespace/Makefile.am
index 0c0f6887ab720c34e0a62e441181dc8e16b37113..5f95dbf8d967cd1dda2e195f12b0b1aaeb151545 100644 (file)
--- a/tests/zfs-tests/tests/functional/user_namespace/Makefile.am
+++ b/tests/zfs-tests/tests/functional/user_namespace/Makefile.am
@@ -2,6 +2,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/user_namespace
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       user_namespace_common.kshlib \
-       user_namespace.cfg \
        user_namespace_001.ksh
+
+dist_pkgdata_DATA = \
+       user_namespace_common.kshlib \
+       user_namespace.cfg

diff --git a/tests/zfs-tests/tests/functional/userquota/Makefile.am b/tests/zfs-tests/tests/functional/userquota/Makefile.am
index b7f38f98e9b8bee344128bfdd6fcdcedfadeade6..8f0287bc17b23df7dc7a2e99bf78ee55558a6938 100644 (file)
--- a/tests/zfs-tests/tests/functional/userquota/Makefile.am
+++ b/tests/zfs-tests/tests/functional/userquota/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/userquota
 dist_pkgdata_SCRIPTS = \
-       userquota.cfg \
-       userquota_common.kshlib \
        setup.ksh \
        cleanup.ksh \
        groupspace_001_pos.ksh \
@@ -23,3 +21,7 @@ dist_pkgdata_SCRIPTS = \
        userspace_001_pos.ksh \
        userspace_002_pos.ksh \
        userspace_003_pos.ksh
+
+dist_pkgdata_DATA = \
+       userquota.cfg \
+       userquota_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/vdev_zaps/Makefile.am b/tests/zfs-tests/tests/functional/vdev_zaps/Makefile.am
index 95dda3e92027d39484eea76c5d012cb390a4df8f..4efb1bcf233a97dda13f6be4ffd168c2905c2071 100644 (file)
--- a/tests/zfs-tests/tests/functional/vdev_zaps/Makefile.am
+++ b/tests/zfs-tests/tests/functional/vdev_zaps/Makefile.am
@@ -8,5 +8,7 @@ dist_pkgdata_SCRIPTS = \
        vdev_zaps_004_pos.ksh \
        vdev_zaps_005_pos.ksh \
        vdev_zaps_006_pos.ksh \
-       vdev_zaps_007_pos.ksh \
+       vdev_zaps_007_pos.ksh
+
+dist_pkgdata_DATA = \
        vdev_zaps.kshlib

diff --git a/tests/zfs-tests/tests/functional/xattr/Makefile.am b/tests/zfs-tests/tests/functional/xattr/Makefile.am
index e404e84b1694a2488205699534739f2ffeccf67f..17001885f1ca1101744f0e7f169b234aa32922ae 100644 (file)
--- a/tests/zfs-tests/tests/functional/xattr/Makefile.am
+++ b/tests/zfs-tests/tests/functional/xattr/Makefile.am
@@ -1,9 +1,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/xattr
 dist_pkgdata_SCRIPTS = \
-       xattr_common.kshlib \
        setup.ksh \
        cleanup.ksh \
-       xattr.cfg \
        xattr_001_pos.ksh \
        xattr_002_neg.ksh \
        xattr_003_neg.ksh \
@@ -16,4 +14,8 @@ dist_pkgdata_SCRIPTS = \
        xattr_010_neg.ksh \
        xattr_011_pos.ksh \
        xattr_012_pos.ksh \
-       xattr_013_pos.ksh 
+       xattr_013_pos.ksh
+
+dist_pkgdata_DATA = \
+       xattr_common.kshlib \
+       xattr.cfg

diff --git a/tests/zfs-tests/tests/functional/zvol/Makefile.am b/tests/zfs-tests/tests/functional/zvol/Makefile.am
index 8aba0993ebcd77b1518e423baca44825d9d44819..e4910754bb817ab91754eac1aa4345c4caaaea5c 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/Makefile.am
+++ b/tests/zfs-tests/tests/functional/zvol/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/zvol
-dist_pkgdata_SCRIPTS = \
+dist_pkgdata_DATA = \
        zvol.cfg \
        zvol_common.shlib
 

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile.am b/tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile.am
index 7d68d0cfc1744f558dd851c99966b6120fa9c75f..480c0048cfd8fd29afe5ca7bd04d144fa51d41c5 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile.am
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/zvol/zvol_swap
 dist_pkgdata_SCRIPTS = \
-       zvol_swap.cfg \
        cleanup.ksh \
        setup.ksh \
        zvol_swap_001_pos.ksh \
@@ -9,3 +8,6 @@ dist_pkgdata_SCRIPTS = \
        zvol_swap_004_pos.ksh \
        zvol_swap_005_pos.ksh \
        zvol_swap_006_pos.ksh
+
+dist_pkgdata_DATA = \
+       zvol_swap.cfg

diff --git a/tests/zfs-tests/tests/perf/Makefile.am b/tests/zfs-tests/tests/perf/Makefile.am
index a0502037e4c20a7f2aedba178dad7c3b2427dc52..d31bba0e22514b83764f53d0895142f146782bde 100644 (file)
--- a/tests/zfs-tests/tests/perf/Makefile.am
+++ b/tests/zfs-tests/tests/perf/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/perf
-dist_pkgdata_SCRIPTS = perf.shlib
+dist_pkgdata_DATA = perf.shlib
 
 SUBDIRS = \
        fio \

diff --git a/tests/zfs-tests/tests/perf/fio/Makefile.am b/tests/zfs-tests/tests/perf/fio/Makefile.am
index 9604a9df6856e63c7b5e3d286464602c549ea617..c4a2a4c3f5861930d685c8a51e7ebd27c99a2c8b 100644 (file)
--- a/tests/zfs-tests/tests/perf/fio/Makefile.am
+++ b/tests/zfs-tests/tests/perf/fio/Makefile.am
@@ -1,5 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/perf/fio
-dist_pkgdata_SCRIPTS = \
+dist_pkgdata_DATA = \
        mkfiles.fio \
        random_reads.fio \
        random_readwrite.fio \