From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUZf4-000245-2Q for qemu-devel@nongnu.org; Mon, 31 Mar 2014 06:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUZf2-0008W3-T5 for qemu-devel@nongnu.org; Mon, 31 Mar 2014 06:41:50 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUZf2-0008S8-MS for qemu-devel@nongnu.org; Mon, 31 Mar 2014 06:41:48 -0400 From: Peter Maydell Date: Mon, 31 Mar 2014 11:41:40 +0100 Message-Id: <1396262500-6872-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] tests/Makefile: Don't run any qtests twice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org Commit 3687d5325 accidentally resulted in our 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). Run the list of qtests through $(sort) to remove duplicates so we only ever run a qtest once. Reported-by: Andreas Färber Signed-off-by: Peter Maydell --- tests/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index 2d021fb..21d4197 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -277,6 +277,12 @@ tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_hel # QTest rules TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) + +# Now sort to remove possible duplicates resulting from including +# all of one target's tests in another's (eg i386, x86_64) +$(foreach TARGET,$(TARGETS), \ + $(eval check-qtest-$(TARGET)-y := $(sort $(check-qtest-$(TARGET)-y)))) + QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),)) check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) -- 1.9.0