From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYEDK-0002ht-4d for qemu-devel@nongnu.org; Fri, 12 Aug 2016 11:17:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYEDE-0007OL-27 for qemu-devel@nongnu.org; Fri, 12 Aug 2016 11:17:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYEDD-0007NW-RS for qemu-devel@nongnu.org; Fri, 12 Aug 2016 11:17:31 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 4574F37E62 for ; Fri, 12 Aug 2016 09:19:37 +0000 (UTC) Received: from lemon.nay.redhat.com (dhcp-15-153.nay.redhat.com [10.66.15.153]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7C9JYJd018547 for ; Fri, 12 Aug 2016 05:19:36 -0400 From: Fam Zheng Date: Fri, 12 Aug 2016 17:19:34 +0800 Message-Id: <1470993574-11906-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH RFC] tests: Run qtest cases in parallel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Previously all test cases in a category, such as check-qtest-y, are executed in a single long gtester command. This patch separates each test into its own make target to allow better parallism. Signed-off-by: Fam Zheng --- This saves 50% of the time "make check takes" compared to on master (I use -j8). RFC because I'm not sure if the new gcov usage is correct with the now much higher level of parallism compared to before. --- tests/Makefile.include | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 14be491..9bf0326 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -691,27 +691,29 @@ GCOV_OPTIONS = -n $(if $(V),-f,) # gtester tests, possibly with verbose output .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y) + +qtest-run-%: tests/% $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) - $(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ + $(call quiet-command,\ + $(if $(QTEST_TARGET), \ + QTEST_QEMU_BINARY=$(QTEST_TARGET)-softmmu/qemu-system-$(QTEST_TARGET)) \ QTEST_QEMU_IMG=qemu-img$(EXESUF) \ MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \ - gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER $@") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) + gtester $< $(GTESTER_OPTIONS) -m=$(SPEED),"GTESTER $<") + $(if $(CONFIG_GCOV), @echo Gcov report for $<:;\ + $(GCOV) $(GCOV_OPTIONS) $< -o `dirname $<`; \ + ) + +$(foreach target, $(QTEST_TARGETS), \ + $(eval check-qtest-$(target): QTEST_TARGET := $(target)) \ + $(eval check-qtest-$(target): $(patsubst tests/%, qtest-run-%, \ + $(check-qtest-y) \ + $(check-qtest-$(target)-y) \ + $(check-qtest-generic-y))) \ +) .PHONY: $(patsubst %, check-%, $(check-unit-y)) -$(patsubst %, check-%, $(check-unit-y)): check-%: % - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) - $(call quiet-command, \ - MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \ - gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*") - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y) $(gcov-files-generic-y); do \ - echo Gcov report for $$f:;\ - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ - done,) +$(patsubst %, check-%, $(check-unit-y)): check-tests/%: qtest-run-% # gtester tests with XML output -- 2.7.4