tests/vm: Allow to set qemu-img path

[qemu.git] / tests / vm / Makefile.include

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index a61c236b8e9c852d5edfa3a1c7dadc02a5e9369e..9e7c46a4735b7b6aa587ae044498f88ab541f52d 100644 (file)
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -2,20 +2,22 @@
 
 .PHONY: vm-build-all vm-clean-all
 
-IMAGES := ubuntu.i386 freebsd netbsd openbsd centos
+IMAGES := ubuntu.i386 freebsd netbsd openbsd centos fedora
 IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
 IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
 
 .PRECIOUS: $(IMAGE_FILES)
 
-vm-test:
-       @echo "vm-test: Test QEMU in preconfigured virtual machines"
+# 'vm-help' target was historically named 'vm-test'
+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"
        @echo ""
        @echo "  vm-build-all                    - Build QEMU in all VMs"
        @echo "  vm-clean-all                    - Clean up VM images"
@@ -32,6 +34,7 @@ vm-test:
        @echo "    DEBUG=1                       - Enable verbose output on host and interactive debugging"
        @echo "    V=1                           - Enable verbose ouput on host and guest commands"
        @echo "    QEMU=/path/to/qemu            - Change path to QEMU binary"
+       @echo "    QEMU_IMG=/path/to/qemu-img    - Change path to qemu-img tool"
 
 vm-build-all: $(addprefix vm-build-, $(IMAGES))
 
@@ -78,6 +81,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img
 vm-boot-ssh-%: $(IMAGES_DIR)/%.img
        $(call quiet-command, \
                $(SRC_PATH)/tests/vm/$* \
+               $(if $(J),--jobs $(J)) \
                --image "$<" \
                --interactive \
                false, \