@@ -4,6 +4,10 @@ build_dir := build
44ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
55ISO_PATH := $(build_dir ) /live-image-$(ARCH ) .hybrid.iso
66
7+ # scripts/check-qemu-install requires --uefi on arm64/aarch64 hosts; on
8+ # amd64 it stays optional.
9+ UEFI_FLAG := $(if $(filter arm64 aarch64,$(ARCH ) ) ,--uefi,)
10+
711# Test targets forward extra CLI arguments (e.g. `make test -- --match foo`)
812# to their scripts via $(MAKECMDGOALS). Those extra words are also goals as
913# far as make is concerned, so without this they'd fall through to the `%:`
@@ -49,17 +53,17 @@ test-vpp:
4953.PHONY : testc
5054.ONESHELL :
5155testc :
52- scripts/check-qemu-install --debug --match=" !vpp" --cpu 2 --memory 7 --configtest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
56+ scripts/check-qemu-install --debug --match=" !vpp" $( UEFI_FLAG ) --cpu 2 --memory 7 --configtest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
5357
5458.PHONY : testcvpp
5559.ONESHELL :
5660testcvpp :
57- scripts/check-qemu-install --debug --match=" vpp" --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --configtest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
61+ scripts/check-qemu-install --debug --match=" vpp" $( UEFI_FLAG ) --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --configtest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
5862
5963.PHONY : testraid
6064.ONESHELL :
6165testraid :
62- scripts/check-qemu-install --debug --raid --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
66+ scripts/check-qemu-install --debug $( UEFI_FLAG ) --raid --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
6367
6468.PHONY : testsb
6569.ONESHELL :
@@ -69,12 +73,12 @@ testsb:
6973.PHONY : testtpm
7074.ONESHELL :
7175testtpm :
72- scripts/check-qemu-install --debug --tpmtest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
76+ scripts/check-qemu-install --debug $( UEFI_FLAG ) --tpmtest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
7377
7478.PHONY : testifname
7579.ONESHELL :
7680testifname :
77- scripts/check-qemu-install --debug --ifnametest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
81+ scripts/check-qemu-install --debug $( UEFI_FLAG ) --ifnametest --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
7882
7983.PHONY : test-ci-qcow2
8084.ONESHELL :
@@ -84,17 +88,17 @@ test-ci-qcow2:
8488 exit 1
8589 fi
8690 rm -f cloud-init-image-$(ARCH ) .qcow2 ; cp $$(ls -t build/*.qcow2 | head -n 1 ) cloud-init-image-$(ARCH ) .qcow2
87- scripts/check-qemu-install --debug --cloud-init --disk cloud-init-image-$(ARCH ) .qcow2 $(filter-out $@ ,$(MAKECMDGOALS ) )
91+ scripts/check-qemu-install --debug $( UEFI_FLAG ) --cloud-init --disk cloud-init-image-$(ARCH ) .qcow2 $(filter-out $@ ,$(MAKECMDGOALS ) )
8892
8993.PHONY : test-image-update
9094.ONESHELL :
9195test-image-update :
92- scripts/check-qemu-install --debug --test-image-update --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
96+ scripts/check-qemu-install --debug $( UEFI_FLAG ) --test-image-update --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
9397
9498.PHONY : qemu-live
9599.ONESHELL :
96100qemu-live :
97- scripts/check-qemu-install --qemu-cmd --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
101+ scripts/check-qemu-install --qemu-cmd $( UEFI_FLAG ) --iso $(ISO_PATH ) $(filter-out $@ ,$(MAKECMDGOALS ) )
98102
99103.PHONY : oci
100104.ONESHELL :
0 commit comments