aboutsummaryrefslogtreecommitdiff
path: root/tests/vm
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2020-03-03 15:06:20 +0000
committerAlex Bennée <alex.bennee@linaro.org>2020-03-04 09:57:33 +0000
commit39d87c8c0c17a837519d6569c41e75eea15e7943 (patch)
treef01ae802f7a90e496ea8d51d7a1dd6113f5ca576 /tests/vm
parentaf17e7e7d31aef6336ebcdf17f4ae1ad98637b52 (diff)
downloadqemu-39d87c8c0c17a837519d6569c41e75eea15e7943.zip
qemu-39d87c8c0c17a837519d6569c41e75eea15e7943.tar.gz
qemu-39d87c8c0c17a837519d6569c41e75eea15e7943.tar.bz2
configure: detect and report genisoimage
This is used for some of the vm-build tests so lets detect it and behave sanely when it is not installed. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200303150622.20133-8-alex.bennee@linaro.org>
Diffstat (limited to 'tests/vm')
-rw-r--r--tests/vm/Makefile.include14
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index 778e506..1bf9693 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -2,7 +2,11 @@
.PHONY: vm-build-all vm-clean-all
-IMAGES := ubuntu.i386 freebsd netbsd openbsd centos fedora
+IMAGES := freebsd netbsd openbsd centos fedora
+ifneq ($(GENISOIMAGE),)
+IMAGES += ubuntu.i386 centos
+endif
+
IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
@@ -12,12 +16,16 @@ IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
vm-help vm-test:
@echo "vm-help: Test QEMU in preconfigured virtual machines"
@echo
- @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM"
@echo " vm-build-freebsd - Build QEMU in FreeBSD VM"
@echo " vm-build-netbsd - Build QEMU in NetBSD VM"
@echo " vm-build-openbsd - Build QEMU in OpenBSD VM"
- @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker"
@echo " vm-build-fedora - Build QEMU in Fedora VM"
+ifneq ($(GENISOIMAGE),)
+ @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker"
+ @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM"
+else
+ @echo " (install genisoimage to build centos/ubuntu images)"
+endif
@echo ""
@echo " vm-build-all - Build QEMU in all VMs"
@echo " vm-clean-all - Clean up VM images"