[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/38] Makefile: Add rules to run vm tests
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 16/38] Makefile: Add rules to run vm tests |
Date: |
Fri, 8 Sep 2017 17:54:44 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
---
Makefile | 2 ++
configure | 2 +-
tests/vm/Makefile.include | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 tests/vm/Makefile.include
diff --git a/Makefile b/Makefile
index 337a1f6f9b..946eb2ce35 100644
--- a/Makefile
+++ b/Makefile
@@ -822,6 +822,7 @@ endif
-include $(wildcard *.d tests/*.d)
include $(SRC_PATH)/tests/docker/Makefile.include
+include $(SRC_PATH)/tests/vm/Makefile.include
.PHONY: help
help:
@@ -845,6 +846,7 @@ help:
@echo 'Test targets:'
@echo ' check - Run all tests (check-help for details)'
@echo ' docker - Help about targets running tests inside
Docker containers'
+ @echo ' vm-test - Help about targets running tests inside VM'
@echo ''
@echo 'Documentation targets:'
@echo ' html info pdf txt'
diff --git a/configure b/configure
index a541aadebc..c755d733a7 100755
--- a/configure
+++ b/configure
@@ -6557,7 +6557,7 @@ if test "$ccache_cpp2" = "yes"; then
fi
# build tree in object directory in case the source is not in the current
directory
-DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos
tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests"
+DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos
tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm"
DIRS="$DIRS docs docs/interop fsdev"
DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
DIRS="$DIRS roms/seabios roms/vgabios"
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
new file mode 100644
index 0000000000..5daa2a3b73
--- /dev/null
+++ b/tests/vm/Makefile.include
@@ -0,0 +1,42 @@
+# Makefile for VM tests
+
+.PHONY: vm-build-all
+
+IMAGES := ubuntu.i386 freebsd netbsd openbsd
+IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))
+
+.PRECIOUS: $(IMAGE_FILES)
+
+vm-test:
+ @echo "vm-test: 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"
+
+vm-build-all: $(addprefix vm-build-, $(IMAGES))
+
+tests/vm/%.img: $(SRC_PATH)/tests/vm/% \
+ $(SRC_PATH)/tests/vm/basevm.py \
+ $(SRC_PATH)/tests/vm/Makefile.include
+ $(call quiet-command, \
+ $< \
+ $(if $(V)$(DEBUG), --debug) \
+ --image "$@" \
+ --force \
+ --build-image $@, \
+ " VM-IMAGE $*")
+
+
+# Build in VM $(IMAGE)
+vm-build-%: tests/vm/%.img
+ $(call quiet-command, \
+ $(SRC_PATH)/tests/vm/$* \
+ $(if $(V)$(DEBUG), --debug) \
+ $(if $(DEBUG), --interactive) \
+ $(if $(J),--jobs $(J)) \
+ --image "$<" \
+ --build-qemu $(SRC_PATH), \
+ " VM-BUILD $*")
+
--
2.13.5
- [Qemu-devel] [PULL 06/38] docker: Enable features explicitly in test-full, (continued)
- [Qemu-devel] [PULL 06/38] docker: Enable features explicitly in test-full, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 08/38] gitignore: Ignore vm test images, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 07/38] tests/docker: Clean up paths, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 09/38] qemu.py: Add "wait()" method, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 10/38] scripts: Add archive-source.sh, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 11/38] tests: Add vm test lib, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 12/38] tests: Add ubuntu.i386 image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 13/38] tests: Add FreeBSD image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 14/38] tests: Add NetBSD image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 15/38] tests: Add OpenBSD image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 16/38] Makefile: Add rules to run vm tests,
Fam Zheng <=
- [Qemu-devel] [PULL 17/38] MAINTAINERS: Add tests/vm entry, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 18/38] tests: Add README for vm tests, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 19/38] docker: Use archive-source.py, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 20/38] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 21/38] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 22/38] docker: Use unconfined security profile, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 23/38] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 24/38] docker: Add test-block, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 25/38] docker: Drop 'set -e' from run script, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 26/38] vl: Don't include vde header, Fam Zheng, 2017/09/08