summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-12-09 10:14:02 +0100
committerChristian Poessinger <christian@poessinger.com>2021-12-09 23:26:15 +0100
commit596a0fdf679da6ecb48b620f35df76008566c617 (patch)
tree63c9c05240e59d0071c121d9fd52c5f3692c8a14
parenta48cd47509125a267cf1b34c68484e80bcf1e0a0 (diff)
downloadvyos-build-596a0fdf679da6ecb48b620f35df76008566c617.tar.gz
vyos-build-596a0fdf679da6ecb48b620f35df76008566c617.zip
Makefile: add common helper to check if ISO was build before running tests
(cherry picked from commit c5dee499abaf729dc9388c0b86530c0d09fd9fd1)
-rw-r--r--Makefile26
1 files changed, 9 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index a4617232..95b6f24e 100644
--- a/Makefile
+++ b/Makefile
@@ -250,40 +250,32 @@ xcp-ng-iso: check_build_config clean prepare
@scripts/copy-image
exit 0
-.PHONY: test
+.PHONY: checkiso
.ONESHELL:
-test:
+checkiso:
if [ ! -f build/live-image-amd64.hybrid.iso ]; then
echo "Could not find build/live-image-amd64.hybrid.iso"
exit 1
fi
+
+.PHONY: test
+.ONESHELL:
+test: checkiso
scripts/check-qemu-install --debug --uefi build/live-image-amd64.hybrid.iso
.PHONY: test-no-interfaces
.ONESHELL:
-test-no-interfaces:
- if [ ! -f build/live-image-amd64.hybrid.iso ]; then
- echo "Could not find build/live-image-amd64.hybrid.iso"
- exit 1
- fi
+test-no-interfaces: checkiso
scripts/check-qemu-install --debug --no-interfaces build/live-image-amd64.hybrid.iso
.PHONY: testd
.ONESHELL:
-testd:
- if [ ! -f build/live-image-amd64.hybrid.iso ]; then
- echo "Could not find build/live-image-amd64.hybrid.iso"
- exit 1
- fi
+testd: checkiso
scripts/check-qemu-install --debug --configd build/live-image-amd64.hybrid.iso
.PHONY: testc
.ONESHELL:
-testc:
- if [ ! -f build/live-image-amd64.hybrid.iso ]; then
- echo "Could not find build/live-image-amd64.hybrid.iso"
- exit 1
- fi
+testc: checkiso
scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso
.PHONY: clean