Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Stoiko Ivanov 2019-05-23 15:32:53 +02:00 committed by Brian Behlendorf
parent 0c6206e7f1
commit 27b446f799
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/zfs-tests/tests/functional/alloc_class/Makefile.am
View File

@ -1,7 +1,5 @@
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/alloc_class pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/alloc_class
dist_pkgdata_SCRIPTS = \ dist_pkgdata_SCRIPTS = \
alloc_class.cfg \
alloc_class.kshlib \
setup.ksh \ setup.ksh \
cleanup.ksh \ cleanup.ksh \
alloc_class_001_pos.ksh \ alloc_class_001_pos.ksh \
@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \
alloc_class_011_neg.ksh \ alloc_class_011_neg.ksh \
alloc_class_012_pos.ksh \ alloc_class_012_pos.ksh \
alloc_class_013_pos.ksh alloc_class_013_pos.ksh
dist_pkgdata_DATA = \
alloc_class.cfg \
alloc_class.kshlib

2
tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib
View File

@ -1,5 +1,3 @@
#!/bin/ksh
# #
# This file and its contents are supplied under the terms of the # This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0. # Common Development and Distribution License ("CDDL"), version 1.0.

1
tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am
View File

@ -3,7 +3,6 @@ dist_pkgdata_SCRIPTS = \
cleanup.ksh \ cleanup.ksh \
zpool_initialize_attach_detach_add_remove.ksh \ zpool_initialize_attach_detach_add_remove.ksh \
zpool_initialize_import_export.ksh \ zpool_initialize_import_export.ksh \
zpool_initialize.kshlib \
zpool_initialize_offline_export_import_online.ksh \ zpool_initialize_offline_export_import_online.ksh \
zpool_initialize_online_offline.ksh \ zpool_initialize_online_offline.ksh \
zpool_initialize_split.ksh \ zpool_initialize_split.ksh \

4
tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am
View File

@ -2,7 +2,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_trim
dist_pkgdata_SCRIPTS = \ dist_pkgdata_SCRIPTS = \
setup.ksh \ setup.ksh \
cleanup.ksh \ cleanup.ksh \
zpool_trim.kshlib \
zpool_trim_attach_detach_add_remove.ksh \ zpool_trim_attach_detach_add_remove.ksh \
zpool_trim_import_export.ksh \ zpool_trim_import_export.ksh \
zpool_trim_multiple.ksh \ zpool_trim_multiple.ksh \
@ -20,3 +19,6 @@ dist_pkgdata_SCRIPTS = \
zpool_trim_unsupported_vdevs.ksh \ zpool_trim_unsupported_vdevs.ksh \
zpool_trim_verify_checksums.ksh \ zpool_trim_verify_checksums.ksh \
zpool_trim_verify_trimmed.ksh zpool_trim_verify_trimmed.ksh
dist_pkgdata_DATA = \
zpool_trim.kshlib

5
tests/zfs-tests/tests/functional/removal/Makefile.am
View File

@ -28,6 +28,9 @@ dist_pkgdata_SCRIPTS = \
removal_with_send.ksh removal_with_send_recv.ksh \ removal_with_send.ksh removal_with_send_recv.ksh \
removal_with_snapshot.ksh removal_with_write.ksh \ removal_with_snapshot.ksh removal_with_write.ksh \
removal_with_zdb.ksh remove_mirror.ksh remove_mirror_sanity.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 pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/removal

2
tests/zfs-tests/tests/perf/Makefile.am
View File

@ -1,5 +1,5 @@
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/perf pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/perf
dist_pkgdata_SCRIPTS = \ dist_pkgdata_DATA = \
nfs-sample.cfg \ nfs-sample.cfg \
perf.shlib perf.shlib