]>
Commit | Line | Data |
---|---|---|
9e02600b SI |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Stoiko Ivanov <s.ivanov@proxmox.com> | |
3 | Date: Thu, 23 May 2019 15:32:53 +0200 | |
4 | Subject: [PATCH] tests: fix cosmetic permission issues during `make install` | |
5 | ||
6 | files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA | |
7 | with 0644. This commit moves all .kshlib, .shlib and .cfg files in the | |
8 | testsuite to dist_pkgdata_DATA, and removes the shebang from | |
9 | zpool_import.kshlib. | |
10 | ||
11 | This ensures that the files are installed with appropriate permissions | |
12 | and silences some warnings from lintian | |
13 | ||
14 | Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> | |
15 | --- | |
16 | tests/zfs-tests/tests/functional/alloc_class/Makefile.am | 6 ++++-- | |
17 | .../tests/functional/cli_root/zpool_import/zpool_import.kshlib | 2 -- | |
18 | .../tests/functional/cli_root/zpool_initialize/Makefile.am | 1 - | |
19 | tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am | 4 +++- | |
20 | tests/zfs-tests/tests/functional/removal/Makefile.am | 5 ++++- | |
21 | tests/zfs-tests/tests/perf/Makefile.am | 2 +- | |
22 | 6 files changed, 12 insertions(+), 8 deletions(-) | |
23 | ||
24 | diff --git a/tests/zfs-tests/tests/functional/alloc_class/Makefile.am b/tests/zfs-tests/tests/functional/alloc_class/Makefile.am | |
25 | index 073eac988..7cffb2eac 100644 | |
26 | --- a/tests/zfs-tests/tests/functional/alloc_class/Makefile.am | |
27 | +++ b/tests/zfs-tests/tests/functional/alloc_class/Makefile.am | |
28 | @@ -1,7 +1,5 @@ | |
29 | pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/alloc_class | |
30 | dist_pkgdata_SCRIPTS = \ | |
31 | - alloc_class.cfg \ | |
32 | - alloc_class.kshlib \ | |
33 | setup.ksh \ | |
34 | cleanup.ksh \ | |
35 | alloc_class_001_pos.ksh \ | |
36 | @@ -17,3 +15,7 @@ dist_pkgdata_SCRIPTS = \ | |
37 | alloc_class_011_neg.ksh \ | |
38 | alloc_class_012_pos.ksh \ | |
39 | alloc_class_013_pos.ksh | |
40 | + | |
41 | +dist_pkgdata_DATA = \ | |
42 | + alloc_class.cfg \ | |
43 | + alloc_class.kshlib | |
44 | 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 | |
45 | index f53b88f79..d050145e4 100644 | |
46 | --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib | |
47 | +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib | |
48 | @@ -1,5 +1,3 @@ | |
49 | -#!/bin/ksh | |
50 | - | |
51 | # | |
52 | # This file and its contents are supplied under the terms of the | |
53 | # Common Development and Distribution License ("CDDL"), version 1.0. | |
54 | 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 | |
55 | index a0a0e0b5c..2ebc376d9 100644 | |
56 | --- a/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am | |
57 | +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am | |
58 | @@ -3,7 +3,6 @@ dist_pkgdata_SCRIPTS = \ | |
59 | cleanup.ksh \ | |
60 | zpool_initialize_attach_detach_add_remove.ksh \ | |
61 | zpool_initialize_import_export.ksh \ | |
62 | - zpool_initialize.kshlib \ | |
63 | zpool_initialize_offline_export_import_online.ksh \ | |
64 | zpool_initialize_online_offline.ksh \ | |
65 | zpool_initialize_split.ksh \ | |
66 | 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 | |
67 | index c357eeffb..d2d3b4ae8 100644 | |
68 | --- a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am | |
69 | +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am | |
70 | @@ -2,7 +2,6 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_trim | |
71 | dist_pkgdata_SCRIPTS = \ | |
72 | setup.ksh \ | |
73 | cleanup.ksh \ | |
74 | - zpool_trim.kshlib \ | |
75 | zpool_trim_attach_detach_add_remove.ksh \ | |
76 | zpool_trim_import_export.ksh \ | |
77 | zpool_trim_multiple.ksh \ | |
78 | @@ -20,3 +19,6 @@ dist_pkgdata_SCRIPTS = \ | |
79 | zpool_trim_unsupported_vdevs.ksh \ | |
80 | zpool_trim_verify_checksums.ksh \ | |
81 | zpool_trim_verify_trimmed.ksh | |
82 | + | |
83 | +dist_pkgdata_DATA = \ | |
84 | + zpool_trim.kshlib | |
85 | diff --git a/tests/zfs-tests/tests/functional/removal/Makefile.am b/tests/zfs-tests/tests/functional/removal/Makefile.am | |
86 | index c5d013e7c..ba42b899a 100644 | |
87 | --- a/tests/zfs-tests/tests/functional/removal/Makefile.am | |
88 | +++ b/tests/zfs-tests/tests/functional/removal/Makefile.am | |
89 | @@ -28,6 +28,9 @@ dist_pkgdata_SCRIPTS = \ | |
90 | removal_with_send.ksh removal_with_send_recv.ksh \ | |
91 | removal_with_snapshot.ksh removal_with_write.ksh \ | |
92 | removal_with_zdb.ksh remove_mirror.ksh remove_mirror_sanity.ksh \ | |
93 | - remove_raidz.ksh remove_expanded.ksh removal.kshlib | |
94 | + remove_raidz.ksh remove_expanded.ksh | |
95 | + | |
96 | +dist_pkgdata_DATA = \ | |
97 | + removal.kshlib | |
98 | ||
99 | pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/removal | |
100 | diff --git a/tests/zfs-tests/tests/perf/Makefile.am b/tests/zfs-tests/tests/perf/Makefile.am | |
101 | index 68dd31ec1..294b136b3 100644 | |
102 | --- a/tests/zfs-tests/tests/perf/Makefile.am | |
103 | +++ b/tests/zfs-tests/tests/perf/Makefile.am | |
104 | @@ -1,5 +1,5 @@ | |
105 | pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/perf | |
106 | -dist_pkgdata_SCRIPTS = \ | |
107 | +dist_pkgdata_DATA = \ | |
108 | nfs-sample.cfg \ | |
109 | perf.shlib | |
110 |