tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS

Now the underlying basevm support passes these along we can expose
some additional variables to our Makefile to allow more customised
tweaking of the build. For example:

  make vm-build-freebsd TARGET_LIST=aarch64-softmmu \
    EXTRA_CONFIGURE_OPTS="--disable-tools --disable-docs" \
    BUILD_TARGET=check-softfloat

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index a58383d26354d48f81ff7cbf52dd59293300ec0d..992d823f6bd22d18984ae9a5bf41cb44a043eca0 100644 (file)
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -19,6 +19,11 @@ vm-test:
        @echo ""
        @echo "  vm-build-all                    - Build QEMU in all VMs"
        @echo "  vm-clean-all                    - Clean up VM images"
+       @echo
+       @echo "Special variables:"
+       @echo "    BUILD_TARGET=foo              - override the build target"
+       @echo "    TARGET_LIST=a,b,c             - Override target list in builds."
+       @echo '    EXTRA_CONFIGURE_OPTS="..."'
 
 vm-build-all: $(addprefix vm-build-, $(IMAGES))
 
@@ -47,6 +52,9 @@ vm-build-%: $(IMAGES_DIR)/%.img
                $(if $(J),--jobs $(J)) \
                $(if $(V),--verbose) \
                --image "$<" \
-               --build-qemu $(SRC_PATH), \
+               $(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \
+               --build-qemu $(SRC_PATH) -- \
+               $(if $(TARGET_LIST),--target-list=$(TARGET_LIST)) \
+               $(if $(EXTRA_CONFIGURE_OPTS),$(EXTRA_CONFIGURE_OPTS)), \
                "  VM-BUILD $*")