diff options
| author | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-09-18 17:59:33 -0500 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-26 21:03:26 +0400 |
| commit | 2b8419cb4911731db6c883fa7b0428ad4a355d9d (patch) | |
| tree | 44bfd8a8ef92c5080ad6a156f9d980281ce6aa06 /tests/Makefile | |
| parent | da1c4ec88ad50c2b73d5fe960c373693f7337cc9 (diff) | |
tests: avoid running duplicate qom-tests
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 <mdroth@linux.vnet.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Cc: qemu-stable@nongnu.org
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index f5de29c0b9..e8bdd1aacd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -193,7 +193,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 \ |