From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvEA-0004la-8K for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCvE6-0003Jo-EX for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCvE6-0003Jc-5c for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:38 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F1B514BFCB for ; Fri, 2 Dec 2016 21:18:37 +0000 (UTC) From: Eduardo Habkost Date: Fri, 2 Dec 2016 19:18:05 -0200 Message-Id: <1480713496-11213-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> References: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.9 06/17] tests: Add rules to non-gtester qtest test cases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Today, simple non-gtester binaries can be run easily by a single Makefile rule (e.g. check-tests/qemu-iotest-quick.sh), but we don't have anything to help us automatically run the same test binary for multiple architectures. This add check-simpleqtest-* rules that will help us run binaries present in $(check-simpleqtest-*-y). Signed-off-by: Eduardo Habkost --- Patch originally submitted as part of series: * [RFC v2 00/20] qmp: Report bus information on 'query-machines' --- tests/Makefile.include | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index e98d3b6..63c4347 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -791,6 +791,40 @@ check-report.html: check-report.xml $(call quiet-command,gtester-report $< > $@,"GEN","$@") +# rules for non-gtester qtest tests: + +SIMPLETEST_OPTIONS = $(if $(V),--verbose,--quiet) + +# rule dependencies are: +# check-simpleqtest: check-simpleqtest-$(ARCH) for each ARCH in QTEST_ARCH +# check-simpleqtest-$(ARCH): check-simpleqtest-$(TEST)-$(ARCH) for each +# TEST in $(check-simpleqtest-$(ARCH)-y) +# (generated by qtest_target macro) +# check-simpleqtest-$(TEST)-$(ARCH): runs test with $(SIMPLETEST_OPTIONS) +# (generated by qtest_target macro) +# +# $(check-simpleqtest-$(ARCH)-y) automatically includes +# $(check-simpleqtest-generic-y) + +define qtest-target + +check-simpleqtest-$(1)-y += $$(check-simpleqtest-generic-y) + +.PHONY: $$(patsubst %, check-simpleqtest-%-$(1), $$(check-simpleqtest-$(1)-y)) +$$(patsubst %, check-simpleqtest-%-$(1), $$(check-simpleqtest-$(1)-y)): check-simpleqtest-%-$(1): % + $$(call quiet-command,QTEST_QEMU_BINARY=$(1)-softmmu/qemu-system-$(1) \ + QTEST_QEMU_IMG=qemu-img$$(EXESUF) \ + MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \ + $$< $$(SIMPLETEST_OPTIONS),"QTEST-$(1)", "$$<") + +.PHONY: check-simpleqtest-$(1) +check-simpleqtest-$(1): $$(patsubst %, check-simpleqtest-%-$(1), $$(check-simpleqtest-$(1)-y)) + +endef + +$(foreach TARGET,$(QTEST_TARGETS),$(eval $(call qtest-target,$(TARGET)))) + + # Other tests QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) @@ -818,7 +852,8 @@ $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json .PHONY: check-qapi-schema check-qtest check-unit check check-clean check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) -check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) +check-simpleqtest: $(patsubst %,check-simpleqtest-%, $(QTEST_TARGETS)) +check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-simpleqtest check-unit: $(patsubst %,check-%, $(check-unit-y)) check-block: $(patsubst %,check-%, $(check-block-y)) check: check-qapi-schema check-unit check-qtest -- 2.7.4