aboutsummaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-utils/xfstests/xfstests/0003-tests-Makefile-make-sure-group.list-DIRT-exists-befo.patch
blob: 5e8bf0c6066978141883b6f68f3150aca1dbe95d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
From b30d5690d7245aa8bd5ca2896e629e62ec97afda Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 8 Feb 2024 23:01:36 +0100
Subject: [PATCH] tests/*/Makefile: make sure group.list DIRT exists before
 install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* sometimes make install was failing with:
  cp: cannot stat 'group.list': No such file or directory
  and bunch of non-fatal messages:
  mv: failed to preserve ownership for 'group.list': Invalid argument

* this was when tools/mkgroupfile did
  mv -f "$new_groups" "$groupfile"
  overwritting the group.list file while install-sh was already
  copying it to output

* in the end easily reproducible by
  1) removing tests/*/group.list before each make install
  2) adding some sleep in mkgroupfile before the mv call

Upstream-Status: Submitted [https://lore.kernel.org/fstests/20240208225241.644701-1-martin.jansa@gmail.com/]

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 tests/btrfs/Makefile    | 2 +-
 tests/ceph/Makefile     | 2 +-
 tests/cifs/Makefile     | 2 +-
 tests/ext4/Makefile     | 2 +-
 tests/f2fs/Makefile     | 2 +-
 tests/generic/Makefile  | 2 +-
 tests/nfs/Makefile      | 2 +-
 tests/ocfs2/Makefile    | 2 +-
 tests/overlay/Makefile  | 2 +-
 tests/perf/Makefile     | 2 +-
 tests/selftest/Makefile | 2 +-
 tests/shared/Makefile   | 2 +-
 tests/tmpfs/Makefile    | 2 +-
 tests/udf/Makefile      | 2 +-
 tests/xfs/Makefile      | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/btrfs/Makefile b/tests/btrfs/Makefile
index 1b72a1a1..6d9995b4 100644
--- a/tests/btrfs/Makefile
+++ b/tests/btrfs/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/ceph/Makefile b/tests/ceph/Makefile
index 2761e1e9..5f24d518 100644
--- a/tests/ceph/Makefile
+++ b/tests/ceph/Makefile
@@ -12,7 +12,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/cifs/Makefile b/tests/cifs/Makefile
index 62c48935..0b89a01d 100644
--- a/tests/cifs/Makefile
+++ b/tests/cifs/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/ext4/Makefile b/tests/ext4/Makefile
index a2a0d561..296e3850 100644
--- a/tests/ext4/Makefile
+++ b/tests/ext4/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/f2fs/Makefile b/tests/f2fs/Makefile
index 9d1ed3c6..0a90b465 100644
--- a/tests/f2fs/Makefile
+++ b/tests/f2fs/Makefile
@@ -15,7 +15,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/generic/Makefile b/tests/generic/Makefile
index b464b22b..d6ed3e55 100644
--- a/tests/generic/Makefile
+++ b/tests/generic/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/nfs/Makefile b/tests/nfs/Makefile
index 128d2a3a..51590b5c 100644
--- a/tests/nfs/Makefile
+++ b/tests/nfs/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/ocfs2/Makefile b/tests/ocfs2/Makefile
index 260ad31b..17e01bf3 100644
--- a/tests/ocfs2/Makefile
+++ b/tests/ocfs2/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/overlay/Makefile b/tests/overlay/Makefile
index 2785b94d..c71e78d6 100644
--- a/tests/overlay/Makefile
+++ b/tests/overlay/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/perf/Makefile b/tests/perf/Makefile
index 0c74ba39..d72c04d9 100644
--- a/tests/perf/Makefile
+++ b/tests/perf/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile
index 3ddfca37..cabc35a9 100644
--- a/tests/selftest/Makefile
+++ b/tests/selftest/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/shared/Makefile b/tests/shared/Makefile
index f3128714..2e6aa718 100644
--- a/tests/shared/Makefile
+++ b/tests/shared/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/tmpfs/Makefile b/tests/tmpfs/Makefile
index 46544313..46b62dad 100644
--- a/tests/tmpfs/Makefile
+++ b/tests/tmpfs/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/udf/Makefile b/tests/udf/Makefile
index ed4434f0..feda69a6 100644
--- a/tests/udf/Makefile
+++ b/tests/udf/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)
diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile
index 5f413e67..6bfafdb1 100644
--- a/tests/xfs/Makefile
+++ b/tests/xfs/Makefile
@@ -14,7 +14,7 @@ default: $(DIRT)
 
 include $(BUILDRULES)
 
-install:
+install: default
 	$(INSTALL) -m 755 -d $(TARGET_DIR)
 	$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
 	$(INSTALL) -m 644 group.list $(TARGET_DIR)