2014-07-11 18:51:43 +02:00
|
|
|
From d78b797a58584419bdfabaebe79322a246790dff Mon Sep 17 00:00:00 2001
|
2014-04-08 17:25:09 +02:00
|
|
|
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
|
|
|
|
Date: Mon, 7 Apr 2014 16:03:08 +0200
|
|
|
|
|
Subject: [PATCH] tests: Don't run qom-test twice
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
Commit 3687d5325 accidentally resulted in running qom-test twice
|
|
|
|
|
for x86_64, once directly via the wildcard, and once because x86_64
|
|
|
|
|
includes all the i386 qtests (which includes qom-test).
|
|
|
|
|
|
|
|
|
|
Filter out x86_64 as well as microblazeel and xtensaeb to fix this.
|
|
|
|
|
|
|
|
|
|
Cc: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
|
|
---
|
|
|
|
|
tests/Makefile | 4 +++-
|
|
|
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/tests/Makefile b/tests/Makefile
|
2014-07-11 18:51:43 +02:00
|
|
|
index 1fcd633..7c0253b 100644
|
2014-04-08 17:25:09 +02:00
|
|
|
--- a/tests/Makefile
|
|
|
|
|
+++ b/tests/Makefile
|
2014-07-11 18:51:43 +02:00
|
|
|
@@ -184,7 +184,9 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
|
2014-04-08 17:25:09 +02:00
|
|
|
check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
|
|
|
|
|
|
|
|
|
|
# qom-test works for all sysemu architectures:
|
|
|
|
|
-$(foreach target,$(SYSEMU_TARGET_LIST), \
|
|
|
|
|
+QTEST_SYSEMU_TARGET_LIST=$(filter-out x86_64 microblazeel xtensaeb, \
|
|
|
|
|
+ $(SYSEMU_TARGET_LIST))
|
|
|
|
|
+$(foreach target,$(QTEST_SYSEMU_TARGET_LIST), \
|
|
|
|
|
$(eval check-qtest-$(target)-y += tests/qom-test$(EXESUF)))
|
|
|
|
|
|
|
|
|
|
check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
|
