From 596a0fdf679da6ecb48b620f35df76008566c617 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 9 Dec 2021 10:14:02 +0100
Subject: Makefile: add common helper to check if ISO was build before running
 tests

(cherry picked from commit c5dee499abaf729dc9388c0b86530c0d09fd9fd1)
---
 Makefile | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3