summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Bennée2020-06-15 16:19:22 +0200
committerAlex Bennée2020-06-16 15:49:05 +0200
commitd16242e524a47d2c3e0281951c6d27979992ac3c (patch)
treef2735e3f1901c1080b41ce660637beabfee39d50
parenttests/tcg: build plugin list from contents of src directory (diff)
downloadqemu-d16242e524a47d2c3e0281951c6d27979992ac3c.tar.gz
qemu-d16242e524a47d2c3e0281951c6d27979992ac3c.tar.xz
qemu-d16242e524a47d2c3e0281951c6d27979992ac3c.zip
tests/tcg: ensure -cpu max also used for plugin run
The check-tcg plugins build was failing because some special case tests that needed -cpu max failed because the plugin variant hadn't carried across the QEMU_OPTS tweak. Guests which globally set QEMU_OPTS=-cpu FOO where unaffected. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20200615141922.18829-3-alex.bennee@linaro.org>
-rw-r--r--tests/tcg/aarch64/Makefile.target3
-rw-r--r--tests/tcg/i386/Makefile.target1
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
index 6d60a2f2ee..b617f2ac7e 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -20,8 +20,9 @@ run-fcvt: fcvt
# Pauth Tests
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
AARCH64_TESTS += pauth-1 pauth-2 pauth-4
-run-pauth-%: QEMU_OPTS += -cpu max
pauth-%: CFLAGS += -march=armv8.3-a
+run-pauth-%: QEMU_OPTS += -cpu max
+run-plugin-pauth-%: QEMU_OPTS += -cpu max
endif
# Semihosting smoke test for linux-user
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index 53efec0668..1a6463a7dc 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -12,6 +12,7 @@ X86_64_TESTS:=$(filter test-i386-ssse3, $(ALL_X86_TESTS))
test-i386-pcmpistri: CFLAGS += -msse4.2
run-test-i386-pcmpistri: QEMU_OPTS += -cpu max
+run-plugin-test-i386-pcmpistri-%: QEMU_OPTS += -cpu max
#
# hello-i386 is a barebones app