From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Gza-0003jX-MD for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9GzT-0006Vd-9c for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:30 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:44455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9GzS-0006Uv-Tb for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:23 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 10:35:22 -0700 From: Michael Roth Date: Thu, 8 Jan 2015 11:33:30 -0600 Message-Id: <1420738472-23267-27-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 26/88] tests: avoid running duplicate qom-tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Since 3687d532 we've been unconditionally adding qom-test to our qtests for every arch. However, some archs inherit their tests from Makefile variables for other archs, such as i386/x86_64, microblaze/microblazeel, and xtensa/xtensaeb. Since these are evaluated in a lazy manner, we ultimately end up adding qom-test twice. In the case x86_64, where we have a large number of machine types that we rerun qom-test for, this has lead to a fairly noticeable increase in the overall run-time of `make check` (78s vs. 42s on my machine). Similar speed-ups are visible for other such archs, but not nearly as significant. Fix this by only adding qom-test to an arch's test list if it's not already present. Signed-off-by: Michael Roth Reviewed-by: Peter Maydell Reviewed-by: Andreas Färber Cc: qemu-stable@nongnu.org Signed-off-by: Michael Tokarev (cherry picked from commit 2b8419cb4911731db6c883fa7b0428ad4a355d9d) Signed-off-by: Michael Roth --- tests/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 4b2e1bb..2ea54fc 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -187,7 +187,8 @@ check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) # qom-test works for all sysemu architectures: $(foreach target,$(SYSEMU_TARGET_LIST), \ - $(eval check-qtest-$(target)-y += tests/qom-test$(EXESUF))) + $(if $(findstring tests/qom-test$(EXESUF), $(check-qtest-$(target)-y)),, \ + $(eval check-qtest-$(target)-y += tests/qom-test$(EXESUF)))) check-qapi-schema-y := $(addprefix tests/qapi-schema/, \ comments.json empty.json funny-char.json indented-expr.json \ -- 1.9.1