tests: fix cosmetic permission issues during `make install`

files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA
with 0644. This commit moves all .kshlib, .shlib and .cfg files in the
testsuite to dist_pkgdata_DATA, and removes the shebang from
zpool_import.kshlib.

This ensures that the files are installed with appropriate permissions
and silences some warnings from lintian

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Closes #8803

diff --git a/tests/zfs-tests/tests/functional/alloc_class/Makefile.am b/tests/zfs-tests/tests/functional/alloc_class/Makefile.am
index 073eac9882e65e81b03e202d62bfd188a52935c2..7cffb2eac4505a9a18742e09a0ce2668356b20e7 100644 (file)
--- a/tests/zfs-tests/tests/functional/alloc_class/Makefile.am
+++ b/tests/zfs-tests/tests/functional/alloc_class/Makefile.am
@@ -1,7 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/alloc_class
 dist_pkgdata_SCRIPTS = \
-       alloc_class.cfg \
-       alloc_class.kshlib \
        setup.ksh \
        cleanup.ksh \
        alloc_class_001_pos.ksh \
@@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \
        alloc_class_011_neg.ksh \
        alloc_class_012_pos.ksh \
        alloc_class_013_pos.ksh
+
+dist_pkgdata_DATA = \
+       alloc_class.cfg \
+       alloc_class.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
index f53b88f794e4d657beb1e28a63f9a935c8db73c3..d050145e44fe6a315bc7778b23148bbabe48b3a9 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
@@ -1,5 +1,3 @@
-#!/bin/ksh
-
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am
index a0a0e0b5cfa59a3c00bbaeb482e378af5fb15294..2ebc376d9cb9a06e091f7278da21fb4c039b6c72 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am
@@ -3,7 +3,6 @@ dist_pkgdata_SCRIPTS = \
        cleanup.ksh \
        zpool_initialize_attach_detach_add_remove.ksh \
        zpool_initialize_import_export.ksh \
-       zpool_initialize.kshlib \
        zpool_initialize_offline_export_import_online.ksh \
        zpool_initialize_online_offline.ksh \
        zpool_initialize_split.ksh \

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am
index c357eeffb3366ede3d353cd0187baf0f46adf0bd..d2d3b4ae88bb724cf3289761acd2336907899c22 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am
@@ -2,7 +2,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_trim
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       zpool_trim.kshlib \
        zpool_trim_attach_detach_add_remove.ksh \
        zpool_trim_import_export.ksh \
        zpool_trim_multiple.ksh \
@@ -20,3 +19,6 @@ dist_pkgdata_SCRIPTS = \
        zpool_trim_unsupported_vdevs.ksh \
        zpool_trim_verify_checksums.ksh \
        zpool_trim_verify_trimmed.ksh
+
+dist_pkgdata_DATA = \
+       zpool_trim.kshlib

diff --git a/tests/zfs-tests/tests/functional/removal/Makefile.am b/tests/zfs-tests/tests/functional/removal/Makefile.am
index c5d013e7c86ad21e12929e2b454bc991c9c3e966..ba42b899acac0983eda99bde94c6ada8cbf57f92 100644 (file)
--- a/tests/zfs-tests/tests/functional/removal/Makefile.am
+++ b/tests/zfs-tests/tests/functional/removal/Makefile.am
@@ -28,6 +28,9 @@ dist_pkgdata_SCRIPTS = \
        removal_with_send.ksh removal_with_send_recv.ksh \
        removal_with_snapshot.ksh removal_with_write.ksh \
        removal_with_zdb.ksh remove_mirror.ksh remove_mirror_sanity.ksh \
-       remove_raidz.ksh remove_expanded.ksh removal.kshlib
+       remove_raidz.ksh remove_expanded.ksh
+
+dist_pkgdata_DATA = \
+       removal.kshlib
 
 pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/removal

diff --git a/tests/zfs-tests/tests/perf/Makefile.am b/tests/zfs-tests/tests/perf/Makefile.am
index 68dd31ec12b1b027bb45b9424a3be5b684b6c466..294b136b38542f6a0a303b3263ede3f9f0f1f300 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 = \
+dist_pkgdata_DATA = \
        nfs-sample.cfg \
        perf.shlib