Clean up (k)shlib and cfg file shebangs

Most kshlib files are imported by other scripts
and do not have a shebang at the top of their files.
Make all kshlib follow this convention.

Remove shebangs from cfg files as well.

Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Close #7406

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

diff --git a/tests/test-runner/include/logapi.shlib b/tests/test-runner/include/logapi.shlib
index fabfc42b1dfccc06855892b2b67f51172c1a4c1e..32fc00616180785d8c5d7c3d2745f9926069c7fa 100644 (file)
--- a/tests/test-runner/include/logapi.shlib
+++ b/tests/test-runner/include/logapi.shlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index 3a310680b521bb53946af111353581bf0af4ee3f..327da2b9fad57a4422612a640243ecbe3e604c36 100644 (file)
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/include/zpool_script.shlib b/tests/zfs-tests/include/zpool_script.shlib
index 52ae6489047a987183cca4264a96d3f3c7f4c7b4..10bc0cc26128aeda384d8ea7913bef157aef877b 100755 (executable)
--- a/tests/zfs-tests/include/zpool_script.shlib
+++ b/tests/zfs-tests/include/zpool_script.shlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # Common functions used by the zpool_status and zpool_iostat tests for running
 # scripts with the -c option.

diff --git a/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib b/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib
index a88ac59c3a458e70d5d6b7a93c2428658ac3d3ea..7723e3083f1d7b2428be87c3aaf774f90afa319a 100644 (file)
--- a/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib
+++ b/tests/zfs-tests/tests/functional/cachefile/cachefile.kshlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/tests/functional/channel_program/Makefile.am b/tests/zfs-tests/tests/functional/channel_program/Makefile.am
index 3b517118d6043584f792ecf97e255531c875f5a8..3886863d1dfbfcd100e2597d58612edf37d9d42f 100644 (file)
--- a/tests/zfs-tests/tests/functional/channel_program/Makefile.am
+++ b/tests/zfs-tests/tests/functional/channel_program/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS = \
        synctask_core
 
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/channel_program
-dist_pkgdata_SCRIPTS = channel_common.kshlib
+dist_pkgdata_DATA = channel_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/channel_program/channel_common.kshlib b/tests/zfs-tests/tests/functional/channel_program/channel_common.kshlib
index 980d7e9d3671b1fd9a072e9c22cef6c7d6dcb2f8..c1ecc52969a5f1317cced7607e5000b86a615dbd 100644 (file)
--- a/tests/zfs-tests/tests/functional/channel_program/channel_common.kshlib
+++ b/tests/zfs-tests/tests/functional/channel_program/channel_common.kshlib
@@ -1,4 +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/zfs_load-key/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile.am
index aaecb9730c523b110f12ad96314adba1a72fb87e..06b4239a6d969caeff974696ea81336e59ee9ab3 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
@@ -2,7 +2,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zfs_load-k
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       zfs_load-key_common.kshlib \
        zfs_load-key.ksh \
        zfs_load-key_all.ksh \
        zfs_load-key_file.ksh \
@@ -11,4 +10,5 @@ dist_pkgdata_SCRIPTS = \
        zfs_load-key_recursive.ksh
 
 dist_pkgdata_DATA = \
-       zfs_load-key.cfg
+       zfs_load-key.cfg \
+       zfs_load-key_common.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib
index 627b68267e135d194f13446ca90d69208b4211a8..d9066f9cbf5719fc29842ff61abd82aca91cacfc 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_events/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_events/Makefile.am
index 44a28e28957c8678640df2637f788616587cef1b..0d4c3862b8cabafddfbab3e5864e0b10d6357c07 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_events/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_events/Makefile.am
@@ -2,9 +2,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_even
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       zpool_events.cfg \
-       zpool_events.kshlib \
        zpool_events_clear.ksh \
        zpool_events_cliargs.ksh \
        zpool_events_follow.ksh \
        zpool_events_poolname.ksh
+
+dist_pkgdata_DATA = \
+       zpool_events.cfg \
+       zpool_events.kshlib

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.cfg
index 6f5da0a76db0e77cd920195cb10447fc3845007d..6018f9d2fd979498560c90b02858fe1669d1ecc7 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.cfg
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.cfg
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # 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_events/zpool_events.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.kshlib
index a64f14a850d30144c2915b2eb0397282f0b5abc7..b92ffb13a8523d3d8da61e46921c5800429e7b02 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events.kshlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # 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_labelclear/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am
index a8bea6864787e89e1501ea3013a1fb87bc4237f0..dc4a0277c6e69817c2c7e9c945a74779d2e9ea67 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile.am
@@ -1,5 +1,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_labelclear
 dist_pkgdata_SCRIPTS = \
-       labelclear.cfg \
        zpool_labelclear_active.ksh \
        zpool_labelclear_exported.ksh
+
+dist_pkgdata_DATA = \
+       labelclear.cfg

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg
index 62d39b05f8dfd14469ba75e44b4a48f6f27ebe98..8bf038270399502ccadcc914c8585fa9780df8b1 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/labelclear.cfg
@@ -1,5 +1,3 @@
-#!/bin/ksh -p
-#
 #
 # 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_reopen/zpool_reopen.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.cfg
index 9227cbb187970e876cc0c46f5b11051ff07988f3..3d6a291e06cde8500e3d9e982fcb62616ce62cd7 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.cfg
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.cfg
@@ -1,5 +1,3 @@
-#!/bin/ksh -p
-
 #
 # 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/fault/Makefile.am b/tests/zfs-tests/tests/functional/fault/Makefile.am
index 8b82211478c27cf131ac4923ac0268957c5c16ec..3c0e31d2a1f0688df9b1bafd683b6891a5261aba 100644 (file)
--- a/tests/zfs-tests/tests/functional/fault/Makefile.am
+++ b/tests/zfs-tests/tests/functional/fault/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/fault
 dist_pkgdata_SCRIPTS = \
-       fault.cfg \
        setup.ksh \
        cleanup.ksh \
        auto_online_001_pos.ksh \
@@ -10,3 +9,6 @@ dist_pkgdata_SCRIPTS = \
        auto_spare_ashift.ksh \
        auto_spare_multiple.ksh \
        scrub_after_resilver.ksh
+
+dist_pkgdata_DATA = \
+       fault.cfg

diff --git a/tests/zfs-tests/tests/functional/fault/fault.cfg b/tests/zfs-tests/tests/functional/fault/fault.cfg
index 16a4fb8359ff3ba9205688585170dd837514a1c3..c7798f2659393f4b1762648c298839ec4769bc7f 100644 (file)
--- a/tests/zfs-tests/tests/functional/fault/fault.cfg
+++ b/tests/zfs-tests/tests/functional/fault/fault.cfg
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/tests/functional/write_dirs/Makefile.am b/tests/zfs-tests/tests/functional/write_dirs/Makefile.am
index 80493ab3ce499fc03bc2418924be21d3ef6d16f6..267a5d1d1b6157f26495c5782305876f513aba80 100644 (file)
--- a/tests/zfs-tests/tests/functional/write_dirs/Makefile.am
+++ b/tests/zfs-tests/tests/functional/write_dirs/Makefile.am
@@ -2,6 +2,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/write_dirs
 dist_pkgdata_SCRIPTS = \
        setup.ksh \
        cleanup.ksh \
-       write_dirs.cfg \
        write_dirs_001_pos.ksh \
        write_dirs_002_pos.ksh
+
+dist_pkgdata_DATA = \
+       write_dirs.cfg

diff --git a/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg b/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg
index 6cb14ad64876acbd0792a9fb2ff5833bebc1964f..400d5bcb1ac5601eaba331b370145e6e76a2dcef 100644 (file)
--- a/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg
+++ b/tests/zfs-tests/tests/functional/write_dirs/write_dirs.cfg
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile.am b/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile.am
index 7007c8cf949b3abc17829388cc5ae312e5b23cd8..9cd9b4149eafa1c5debecea75c3467081076af9e 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile.am
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile.am
@@ -2,5 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/zvol/zvol_ENOSPC
 dist_pkgdata_SCRIPTS = \
        cleanup.ksh \
        setup.ksh \
-       zvol_ENOSPC.cfg \
        zvol_ENOSPC_001_pos.ksh
+
+dist_pkgdata_DATA = \
+       zvol_ENOSPC.cfg

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC.cfg b/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC.cfg
index a2df9c4e0d9700cfeac4dd8e935f01fc07d7e3d9..84986b832db028f97638fc23f2314ff8af1976fe 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC.cfg
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC.cfg
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile.am b/tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile.am
index c4b80389909bddc1301ed12662dace3225086268..c6b15684f45eccd54e3ee40cf3a06f498c02f98a 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile.am
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile.am
@@ -2,7 +2,9 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/zvol/zvol_cli
 dist_pkgdata_SCRIPTS = \
        cleanup.ksh \
        setup.ksh \
-       zvol_cli.cfg \
        zvol_cli_001_pos.ksh \
        zvol_cli_002_pos.ksh \
        zvol_cli_003_neg.ksh
+
+dist_pkgdata_DATA = \
+       zvol_cli.cfg

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli.cfg b/tests/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli.cfg
index 233867efe997f8e381ed20729e3ca14ab5df833a..bede6694c0c60f7f0894f856d27ae3a5d2d72da7 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli.cfg
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli.cfg
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile.am b/tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile.am
index 8859ff3598dba69035c0950f1aac05e5b95b3777..a2c95a3ebb72dd7a6f99a0d9772c5aac62faaff2 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile.am
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile.am
@@ -1,6 +1,5 @@
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/zvol/zvol_misc
 dist_pkgdata_SCRIPTS = \
-       zvol_misc_common.kshlib \
        cleanup.ksh \
        setup.ksh \
        zvol_misc_001_neg.ksh \
@@ -12,3 +11,7 @@ dist_pkgdata_SCRIPTS = \
        zvol_misc_snapdev.ksh \
        zvol_misc_volmode.ksh \
        zvol_misc_zil.ksh
+
+dist_pkgdata_DATA = \
+       zvol_misc_common.kshlib
+

diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib
index 5c8c9847a331b64d0ec6cfe753ad257dfbbab189..1b049a9c820667cb77131f00a673e0bfc5185b5a 100644 (file)
--- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_common.kshlib
@@ -1,4 +1,3 @@
-#!/bin/ksh -p
 #
 # CDDL HEADER START
 #