Skip to content

Commit d455ffb

Browse files
Nowa-AmmerlaanNowa-Ammerlaan
committed
run_tests.sh: adjust for changes to installkernel
When USE=uki the config and System.map are now relocated as well Signed-off-by: Andrew Ammerlaan <[email protected]>
1 parent cee996a commit d455ffb

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎run_tests.sh

+23-23
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,22 @@ TEST_CASES["-generic-uki -dracut -systemd -systemd-boot -uki -ukify grub -refind
5454
5 directories, 3 files"
5555
TEST_CASES["-generic-uki -dracut -systemd -systemd-boot uki ukify -grub -refind"]=\
5656
"/boot
57-
/boot/System.map-${INST_KV}-gentoo-dist
58-
/boot/config-${INST_KV}-gentoo-dist
5957
/efi
6058
/efi/EFI
6159
/efi/EFI/Linux
60+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
61+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
6262
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
6363
64-
4 directories, 3 files"
64+
3 directories, 3 files"
6565
TEST_CASES["-generic-uki -dracut -systemd -systemd-boot uki ukify grub -refind"]=\
6666
"/boot
67-
/boot/System.map-${INST_KV}-gentoo-dist
68-
/boot/config-${INST_KV}-gentoo-dist
6967
/boot/grub
7068
/efi
7169
/efi/EFI
7270
/efi/EFI/Linux
71+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
72+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
7373
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
7474
7575
5 directories, 3 files"
@@ -153,43 +153,43 @@ TEST_CASES["-generic-uki dracut -systemd -systemd-boot -uki -ukify grub -refind"
153153
5 directories, 4 files"
154154
TEST_CASES["-generic-uki dracut -systemd -systemd-boot uki -ukify -grub -refind"]=\
155155
"/boot
156-
/boot/System.map-${INST_KV}-gentoo-dist
157-
/boot/config-${INST_KV}-gentoo-dist
158156
/efi
159157
/efi/EFI
160158
/efi/EFI/Linux
159+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
160+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
161161
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
162162
163-
4 directories, 3 files"
163+
3 directories, 3 files"
164164
TEST_CASES["-generic-uki dracut -systemd -systemd-boot uki -ukify grub -refind"]=\
165165
"/boot
166-
/boot/System.map-${INST_KV}-gentoo-dist
167-
/boot/config-${INST_KV}-gentoo-dist
168166
/boot/grub
169167
/efi
170168
/efi/EFI
171169
/efi/EFI/Linux
170+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
171+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
172172
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
173173
174174
5 directories, 3 files"
175175
TEST_CASES["-generic-uki dracut -systemd -systemd-boot uki ukify -grub -refind"]=\
176176
"/boot
177-
/boot/System.map-${INST_KV}-gentoo-dist
178-
/boot/config-${INST_KV}-gentoo-dist
179177
/efi
180178
/efi/EFI
181179
/efi/EFI/Linux
180+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
181+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
182182
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
183183
184-
4 directories, 3 files"
184+
3 directories, 3 files"
185185
TEST_CASES["-generic-uki dracut -systemd -systemd-boot uki ukify grub -refind"]=\
186186
"/boot
187-
/boot/System.map-${INST_KV}-gentoo-dist
188-
/boot/config-${INST_KV}-gentoo-dist
189187
/boot/grub
190188
/efi
191189
/efi/EFI
192190
/efi/EFI/Linux
191+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
192+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
193193
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
194194
195195
5 directories, 3 files"
@@ -299,22 +299,22 @@ TEST_CASES["generic-uki -dracut -systemd -systemd-boot -uki -ukify grub -refind"
299299
5 directories, 3 files"
300300
TEST_CASES["generic-uki -dracut -systemd -systemd-boot uki -ukify -grub -refind"]=\
301301
"/boot
302-
/boot/System.map-${INST_KV}-gentoo-dist
303-
/boot/config-${INST_KV}-gentoo-dist
304302
/efi
305303
/efi/EFI
306304
/efi/EFI/Linux
305+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
306+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
307307
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
308308
309-
4 directories, 3 files"
309+
3 directories, 3 files"
310310
TEST_CASES["generic-uki -dracut -systemd -systemd-boot uki -ukify grub -refind"]=\
311311
"/boot
312-
/boot/System.map-${INST_KV}-gentoo-dist
313-
/boot/config-${INST_KV}-gentoo-dist
314312
/boot/grub
315313
/efi
316314
/efi/EFI
317315
/efi/EFI/Linux
316+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
317+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
318318
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
319319
320320
5 directories, 3 files"
@@ -387,15 +387,15 @@ TEST_CASES["-generic-uki -dracut -systemd -systemd-boot -uki -ukify -grub refind
387387
4 directories, 4 files"
388388
TEST_CASES["-generic-uki -dracut -systemd -systemd-boot uki ukify -grub refind"]=\
389389
"/boot
390-
/boot/System.map-${INST_KV}-gentoo-dist
391-
/boot/config-${INST_KV}-gentoo-dist
392390
/efi
393391
/efi/EFI
394392
/efi/EFI/Linux
393+
/efi/EFI/Linux/System.map-${INST_KV}-gentoo-dist
394+
/efi/EFI/Linux/config-${INST_KV}-gentoo-dist
395395
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.efi
396396
/efi/EFI/Linux/gentoo-${INST_KV}-gentoo-dist.png
397397
398-
4 directories, 4 files"
398+
3 directories, 4 files"
399399
TEST_CASES["-generic-uki -dracut systemd -systemd-boot -uki -ukify -grub refind"]=\
400400
"/boot
401401
/boot/kernel-${INST_KV}-gentoo-dist

0 commit comments

Comments
 (0)