diff options
Diffstat (limited to 'tests/vm/Makefile.include')
| -rw-r--r-- | tests/vm/Makefile.include | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 9e7c46a473..1bf9693d19 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" @@ -80,7 +88,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ - $(SRC_PATH)/tests/vm/$* \ + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ $(if $(J),--jobs $(J)) \ --image "$<" \ --interactive \ |