From 9cdeaa54beefaecc0ed66c046d39d823b98848ba Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 28 Dec 2024 22:46:17 +0100 Subject: tests: Fix parallel build of iso files We need to use a separate iso tree directory. --- tests/user-qemu.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/user-qemu.mk b/tests/user-qemu.mk index b48f49ec..055b0149 100644 --- a/tests/user-qemu.mk +++ b/tests/user-qemu.mk @@ -175,15 +175,16 @@ QEMU_OPTS += -cpu core2duo-v1 endif tests/test-%.iso: tests/module-% gnumach $(srcdir)/tests/grub.cfg.single.template - rm -rf $(builddir)/tests/isofiles - mkdir -p $(builddir)/tests/isofiles/boot/grub/ + rm -rf $(builddir)/tests/isofiles-$* + mkdir -p $(builddir)/tests/isofiles-$*/boot/grub/ < $(srcdir)/tests/grub.cfg.single.template \ sed -e "s|BOOTMODULE|$(notdir $<)|g" \ -e "s/GNUMACHARGS/$(GNUMACH_ARGS)/g" \ -e "s/TEST_START_MARKER/$(TEST_START_MARKER)/g" \ - >$(builddir)/tests/isofiles/boot/grub/grub.cfg - cp gnumach $< $(builddir)/tests/isofiles/boot/ - grub-mkrescue -o $@ $(builddir)/tests/isofiles + >$(builddir)/tests/isofiles-$*/boot/grub/grub.cfg + cp gnumach $< $(builddir)/tests/isofiles-$*/boot/ + grub-mkrescue -o $@ $(builddir)/tests/isofiles-$* + rm -rf $(builddir)/tests/isofiles-$* tests/test-%: tests/test-%.iso $(srcdir)/tests/run-qemu.sh.template < $(srcdir)/tests/run-qemu.sh.template \ -- cgit v1.2.3