| Message ID | 1449169095-25383-1-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
Andreas Färber <afaerber@suse.de> writes: > 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. > > Cc: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Am 03.12.2015 um 20:06 schrieb Markus Armbruster: > Andreas Färber <afaerber@suse.de> writes: > >> 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. >> >> Cc: Markus Armbruster <armbru@redhat.com> >> Signed-off-by: Andreas Färber <afaerber@suse.de> > > Reviewed-by: Markus Armbruster <armbru@redhat.com> Thanks, applied to qom-next. Andreas
diff --git a/tests/Makefile b/tests/Makefile index 0ef00a1..a1d03b4 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
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. Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> --- tests/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)