diff options
25 files changed, 27 insertions, 30 deletions
diff --git a/tests/test-runner/include/Makefile.am b/tests/test-runner/include/Makefile.am index 7e4080249..d3eeb32de 100644 --- 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 fabfc42b1..32fc00616 100644 --- 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 3a310680b..327da2b9f 100644 --- 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 52ae64890..10bc0cc26 100755 --- 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 a88ac59c3..7723e3083 100644 --- 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 3b517118d..3886863d1 100644 --- 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 980d7e9d3..c1ecc5296 100644 --- 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 aaecb9730..06b4239a6 100644 --- 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 627b68267..d9066f9cb 100644 --- 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 44a28e289..0d4c3862b 100644 --- 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 6f5da0a76..6018f9d2f 100644 --- 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 a64f14a85..b92ffb13a 100644 --- 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 a8bea6864..dc4a0277c 100644 --- 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 62d39b05f..8bf038270 100644 --- 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 9227cbb18..3d6a291e0 100644 --- 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 8b8221147..3c0e31d2a 100644 --- 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 16a4fb835..c7798f265 100644 --- 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 80493ab3c..267a5d1d1 100644 --- 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 6cb14ad64..400d5bcb1 100644 --- 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 7007c8cf9..9cd9b4149 100644 --- 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 a2df9c4e0..84986b832 100644 --- 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 c4b803899..c6b15684f 100644 --- 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 233867efe..bede6694c 100644 --- 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 8859ff359..a2c95a3eb 100644 --- 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 5c8c9847a..1b049a9c8 100644 --- 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 # |