* [PATCH v1 0/2] check-tcg fixes for --enable-plugins
@ 2020-06-15 14:19 Alex Bennée
2020-06-15 14:19 ` [PATCH v1 1/2] tests/tcg: build plugin list from contents of src directory Alex Bennée
2020-06-15 14:19 ` [PATCH v1 2/2] tests/tcg: ensure -cpu max also used for plugin run Alex Bennée
0 siblings, 2 replies; 3+ messages in thread
From: Alex Bennée @ 2020-06-15 14:19 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, Alex Bennée, richard.henderson, f4bug, cota,
aurelien
Hi,
Two minor fixes to deal with test failures with --enable-plugins
builds. I'll include them in tomorrows PR. Please review.
Alex Bennée (2):
tests/tcg: build plugin list from contents of src directory
tests/tcg: ensure -cpu max also used for plugin run
tests/tcg/Makefile.target | 11 ++++++-----
tests/tcg/aarch64/Makefile.target | 5 +++--
tests/tcg/arm/Makefile.target | 2 +-
tests/tcg/i386/Makefile.target | 1 +
4 files changed, 11 insertions(+), 8 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v1 1/2] tests/tcg: build plugin list from contents of src directory
2020-06-15 14:19 [PATCH v1 0/2] check-tcg fixes for --enable-plugins Alex Bennée
@ 2020-06-15 14:19 ` Alex Bennée
2020-06-15 14:19 ` [PATCH v1 2/2] tests/tcg: ensure -cpu max also used for plugin run Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2020-06-15 14:19 UTC (permalink / raw)
To: qemu-devel
Cc: fam, Peter Maydell, berrange, Alex Bennée,
richard.henderson, f4bug, Philippe Mathieu-Daudé,
cota, open list:ARM TCG CPUs, aurelien
If you jump back and forth between branches while developing plugins
you end up debugging failures caused by plugins left in the build
directory. Fix this by basing plugins on the source tree instead.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/Makefile.target | 11 ++++++-----
tests/tcg/aarch64/Makefile.target | 2 +-
tests/tcg/arm/Makefile.target | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index b3cff3cad1a..2ae86776cdc 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -126,9 +126,10 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS))
# If plugins exist also include those in the tests
ifeq ($(CONFIG_PLUGIN),y)
-PLUGIN_DIR=../../plugin
-VPATH+=$(PLUGIN_DIR)
-PLUGINS=$(notdir $(wildcard $(PLUGIN_DIR)/*.so))
+PLUGIN_SRC=$(SRC_PATH)/tests/plugin
+PLUGIN_LIB=../../plugin
+VPATH+=$(PLUGIN_LIB)
+PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c)))
# We need to ensure expand the run-plugin-TEST-with-PLUGIN
# pre-requistes manually here as we can't use stems to handle it. We
@@ -152,7 +153,7 @@ run-%: %
run-plugin-%:
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
- -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
-d plugin -D $*.pout \
$(call strip-plugin,$<), \
"$* on $(TARGET_NAME)")
@@ -168,7 +169,7 @@ run-plugin-%:
$(call run-test, $@, \
$(QEMU) -monitor none -display none \
-chardev file$(COMMA)path=$@.out$(COMMA)id=output \
- -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
-d plugin -D $*.pout \
$(QEMU_OPTS) $(call strip-plugin,$<), \
"$* on $(TARGET_NAME)")
diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
index 312f36cde5f..6d60a2f2eed 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -31,7 +31,7 @@ run-semihosting: semihosting
run-plugin-semihosting-with-%:
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
- -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
$(call strip-plugin,$<) 2> $<.err, \
"$< on $(TARGET_NAME) with $*")
diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
index 3da09a38be7..ec951565626 100644
--- a/tests/tcg/arm/Makefile.target
+++ b/tests/tcg/arm/Makefile.target
@@ -45,7 +45,7 @@ run-semihosting-arm: semihosting-arm
run-plugin-semihosting-with-%:
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
- -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
$(call strip-plugin,$<) 2> $<.err, \
"$< on $(TARGET_NAME) with $*")
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v1 2/2] tests/tcg: ensure -cpu max also used for plugin run
2020-06-15 14:19 [PATCH v1 0/2] check-tcg fixes for --enable-plugins Alex Bennée
2020-06-15 14:19 ` [PATCH v1 1/2] tests/tcg: build plugin list from contents of src directory Alex Bennée
@ 2020-06-15 14:19 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2020-06-15 14:19 UTC (permalink / raw)
To: qemu-devel
Cc: fam, Peter Maydell, berrange, Eduardo Habkost, Alex Bennée,
richard.henderson, f4bug, cota, open list:ARM TCG CPUs,
Paolo Bonzini, aurelien, Richard Henderson
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>
---
tests/tcg/aarch64/Makefile.target | 3 ++-
tests/tcg/i386/Makefile.target | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
index 6d60a2f2eed..b617f2ac7e0 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 53efec06683..1a6463a7dc1 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
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-15 14:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15 14:19 [PATCH v1 0/2] check-tcg fixes for --enable-plugins Alex Bennée
2020-06-15 14:19 ` [PATCH v1 1/2] tests/tcg: build plugin list from contents of src directory Alex Bennée
2020-06-15 14:19 ` [PATCH v1 2/2] tests/tcg: ensure -cpu max also used for plugin run Alex Bennée
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).