diff options
| author | Andreas Färber <afaerber@suse.de> | 2015-11-21 02:20:06 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-12-03 20:07:05 +0100 |
| commit | b5e62af8aa2710d4645cd04e3e8a15722c1616e4 (patch) | |
| tree | bdde40a01103f5770de4039666a802684fd925f0 | |
| parent | 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 (diff) | |
| download | qemu-b5e62af8aa2710d4645cd04e3e8a15722c1616e4.zip | |
tests: Fix check-report-qtest-% target
Commit e253c28 ("tests: Fix how qom-test is run") introduced
$(qtest-generic-y) and used it for check-qtest-% target, but did not
update check-report-qtest-%. This causes check-report-qtest-aarch64.xml
target to fail with a gtester usage error for lack of test arguments.
Fix this by adding $(qtest-generic-y) in check-report-qtest-%.
Also add it in check-clean target, spotted by Markus.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | tests/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 0ef00a1111..a1d03b457d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -612,7 +612,7 @@ $(patsubst %, check-%, $(check-unit-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),"GTESTER $@") + gtester -q $(GTESTER_OPTIONS) -o $@ -m=$(SPEED) $(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 $@") @@ -660,7 +660,7 @@ check: check-qapi-schema check-unit check-qtest check-clean: $(MAKE) -C tests/tcg clean rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y))) + rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) clean: check-clean |