[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] tests: add a Makefile rule to run Python qtests
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 6/6] tests: add a Makefile rule to run Python qtests |
Date: |
Wed, 13 Dec 2017 18:35:57 -0300 |
We can now add Python qtests to the common $(check-qtest-y) /
$(check-qtest-$(TARGET)-y) variable.
Using the $(filter...) function, the check-qtest-% rule splits between C/Python
qtests and can run both types.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/Makefile.include | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index c002352134..13673f6d1d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -828,7 +828,7 @@ endif
TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS)))
ifeq ($(CONFIG_POSIX),y)
QTEST_TARGETS = $(TARGETS)
-check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
+check-qtest-y=$(foreach TARGET,$(TARGETS), $(filter-out %.py,
$(check-qtest-$(TARGET)-y)))
check-qtest-y += $(check-qtest-generic-y)
else
QTEST_TARGETS =
@@ -843,6 +843,7 @@ tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
SPEED = quick
GTESTER_OPTIONS = -k $(if $(V),--verbose,-q)
GCOV_OPTIONS = -n $(if $(V),-f,)
+QPYTHONS_OPTIONS = $(if $(V),-v,)
# gtester tests, possibly with verbose output
@@ -852,11 +853,15 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)):
check-qtest-%: subdir-%-softmmu
$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
QTEST_QEMU_IMG=qemu-img$(EXESUF) \
MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255 +
1))} \
- gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y)
$(check-qtest-generic-y),"GTESTER","$@")
+ gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(filter-out
%.py,$(check-qtest-$*-y) $(check-qtest-generic-y)),"GTESTER","$@")
$(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y)
$(gcov-files-generic-y); do \
echo Gcov report for $$f:;\
$(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \
done,)
+ $(if $(filter %.py,$(check-qtest-$*-y)), \
+ $(call quiet-command,PYTHONPATH=$(SRC_PATH)/scripts \
+ QEMU_PROG=$*-softmmu/qemu-system-$* \
+ $(PYTHON) $(SRC_PATH)/$(filter
%.py,$(check-qtest-$*-y)) $(QPYTHONS_OPTIONS),"PYTEST","$@"),)
.PHONY: $(patsubst %, check-%, $(check-unit-y) $(check-speed-y))
$(patsubst %, check-%, $(check-unit-y) $(check-speed-y)): check-%: %
@@ -874,7 +879,7 @@ $(patsubst %, check-%, $(check-unit-y) $(check-speed-y)):
check-%: %
$(patsubst %, check-report-qtest-%.xml, $(QTEST_TARGETS)):
check-report-qtest-%.xml: $(check-qtest-y)
$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
QTEST_QEMU_IMG=qemu-img$(EXESUF) \
- gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(check-qtest-$*-y)
$(check-qtest-generic-y),"GTESTER","$@")
+ gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(filter-out
%.py,$(check-qtest-$*-y) $(check-qtest-generic-y)),"GTESTER","$@")
check-report-unit.xml: $(check-unit-y)
$(call quiet-command,gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED)
$^,"GTESTER","$@")
--
2.15.1
- [Qemu-devel] [PATCH 0/6] QTests: use Python to run complex tests, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 1/6] iotests.py: split BlockQMPTestCase class of QMPTestCase, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 2/6] iotests.py: move the generic QMPTestCase to qtest.py, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 3/6] qtest.py: use TMPDIR/TEMP if the TEST_DIR env var is missing, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 4/6] qtest.py: add verify_machine(supported_machines), Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 5/6] qtest.py: add a simple main() which calls unittest.main(), Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 6/6] tests: add a Makefile rule to run Python qtests,
Philippe Mathieu-Daudé <=
- Re: [Qemu-devel] [PATCH 0/6] QTests: use Python to run complex tests, Stefan Hajnoczi, 2017/12/14
- Re: [Qemu-devel] [PATCH 0/6] QTests: use Python to run complex tests, Paolo Bonzini, 2017/12/14
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/6] QTests: use Python to run complex tests, Nir Soffer, 2017/12/14
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/6] QTests: use Python to run complex tests, Philippe Mathieu-Daudé, 2017/12/14
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/6] QTests: use Python to run complex tests, Markus Armbruster, 2017/12/14
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/6] QTests: use Python to run complex tests, Paolo Bonzini, 2017/12/14
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/6] QTests: use Python to run complex tests, Peter Maydell, 2017/12/14
- Re: [Qemu-devel] [Qemu-block] [PATCH 0/6] QTests: use Python to run complex tests, Paolo Bonzini, 2017/12/14
Re: [Qemu-devel] [PATCH 0/6] QTests: use Python to run complex tests, Philippe Mathieu-Daudé, 2017/12/14