[PULL,08/26] tests/tcg: add QEMU_OPT option for test runner

Message ID	20190312170931.25013-9-alex.bennee@linaro.org
State	Accepted
Commit	3d55c026241d2717b3fd97800889c19fad7b6ae8
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:13 +0000 Message-Id: <20190312170931.25013-9-alex.bennee@linaro.org> In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 08/26] tests/tcg: add QEMU_OPT option for test runner Precedence: list Cc: Richard Henderson <richard.henderson@linaro.org>, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	final testing updates for 4.0 \| expand [PULL,00/26] final testing updates for 4.0 [PULL,01/26] travis: Bump Xcode 10 image to 10.2 [PULL,02/26] .travis.yml: combine docs and tools build with out-of-tree [PULL,03/26] .travis.yml: reduce the module builds to major architectures [PULL,04/26] Makefile: explicitly pass $(SRC_PATH) to gcovr [PULL,05/26] Makefile: explicitly pass $(BUILD_DIR) to gcovr [PULL,06/26] tests/tcg: add softmmu awareness to Makefile [PULL,07/26] tests/tcg: enable tcg tests for softmmu [PULL,08/26] tests/tcg: add QEMU_OPT option for test runner [PULL,09/26] tests/tcg: split run-test into user and system variants [PULL,10/26] tests/tcg: add gdb runner variant [PULL,11/26] tests/tcg/mips: fix hello-mips compilation [PULL,12/26] tests/docker: add debian-xtensa-cross image [PULL,13/26] tests/tcg/xtensa: enable system tests [PULL,14/26] tests/tcg/arm: add ARMv6-M UNDEFINED 32-bit instruction test [PULL,15/26] tests/docker: add fedora-cris-cross compilers [PULL,16/26] tests/tcg/cris: cleanup sys.c [PULL,17/26] tests/tcg: split cris tests into bare and libc directories [PULL,18/26] tests/tcg/cris: comment out the ccs test [PULL,19/26] tests/tcg/cris: align mul operations [PULL,20/26] tests/tcg: enable cris base user-mode tests [PULL,21/26] tests/tcg: provide a minilib for system tests [PULL,22/26] tests/tcg/i386: add system mode Hello World test [PULL,23/26] tests/tcg/i386: add memory test to exercise softmmu [PULL,24/26] tests/tcg/arm: account for pauth randomness [PULL,25/26] .travis.yml: separate softfloat from check-tcg [PULL,26/26] .travis.yml: add softmmu check-tcg tests

Message ID

20190312170931.25013-9-alex.bennee@linaro.org

State

Accepted

Commit

3d55c026241d2717b3fd97800889c19fad7b6ae8

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Tue, 12 Mar 2019 17:09:13 +0000
Message-Id: <20190312170931.25013-9-alex.bennee@linaro.org>
In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org>
References: <20190312170931.25013-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 08/26] tests/tcg: add QEMU_OPT option for test
	runner
Precedence: list
Cc: Richard Henderson <richard.henderson@linaro.org>, =?utf-8?q?Alex_Benn?=
	=?utf-8?b?w6ll?= <alex.bennee@linaro.org>, 	qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

final testing updates for 4.0 | expand

Commit Message

Alex Bennée March 12, 2019, 5:09 p.m. UTC

This will allow tests to modify the QEMU invocation with for example
different -cpu stazas without having to define a whole new set of
runner types.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


-- 
2.20.1

diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile
index 55feab0f67..454d0a4119 100644
--- a/tests/tcg/Makefile
+++ b/tests/tcg/Makefile
@@ -54,10 +54,13 @@  LDFLAGS=
 # The QEMU for this TARGET
 ifdef CONFIG_USER_ONLY
 QEMU=../qemu-$(TARGET_NAME)
+QEMU_OPTS=
 else
 QEMU=../qemu-system-$(TARGET_NAME)
+QEMU_OPTS=-monitor none -display none
 endif
 
+
 # If TCG debugging is enabled things are a lot slower
 ifeq ($(CONFIG_DEBUG_TCG),y)
 TIMEOUT=45
@@ -108,7 +111,7 @@  RUN_TESTS=$(patsubst %,run-%, $(TESTS))
 RUN_TESTS+=$(EXTRA_RUNS)
 
 run-%: %
-	$(call run-test, $<, $(QEMU) $<, "$< on $(TARGET_NAME)")
+	$(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)")
 
 .PHONY: run
 run: $(RUN_TESTS)

[PULL,08/26] tests/tcg: add QEMU_OPT option for test runner

Commit Message

Patch