[Qemu-devel] [PATCH for-2.5 v2] tests: Fix check-report-qtest-% target

[Qemu-devel] [PATCH for-2.5 v2] tests: Fix check-report-qtest-% target

[Andreas Färber]

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(-)

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
 
-- 
2.6.2

Re: [Qemu-devel] [PATCH for-2.5 v2] tests: Fix check-report-qtest-% target

[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>

Re: [Qemu-devel] [PATCH for-2.5 v2] tests: Fix check-report-qtest-% target

[Andreas Färber]

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

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)