| Message ID | 1448069894-13477-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-%. > > Cc: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > tests/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/Makefile b/tests/Makefile > index b937984..592cba9 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -613,7 +613,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 $@") Does check-clean need fixing, too?
diff --git a/tests/Makefile b/tests/Makefile index b937984..592cba9 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -613,7 +613,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 $@")
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-%. Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)