[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/21] tests/tcg: build plugin list from contents of src directory
From: |
Alex Bennée |
Subject: |
[PULL 19/21] tests/tcg: build plugin list from contents of src directory |
Date: |
Tue, 16 Jun 2020 13:53:22 +0100 |
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>
Message-Id: <20200615141922.18829-2-alex.bennee@linaro.org>
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
- [PULL 05/21] cpu: convert queued work to a QSIMPLEQ, (continued)
- [PULL 05/21] cpu: convert queued work to a QSIMPLEQ, Alex Bennée, 2020/06/16
- [PULL 07/21] cputlb: destroy CPUTLB with tlb_destroy, Alex Bennée, 2020/06/16
- [PULL 13/21] include/qemu: Added tsan.h for annotations., Alex Bennée, 2020/06/16
- [PULL 14/21] util: Added tsan annotate for thread name., Alex Bennée, 2020/06/16
- [PULL 08/21] qht: call qemu_spin_destroy for head buckets, Alex Bennée, 2020/06/16
- [PULL 09/21] tcg: call qemu_spin_destroy for tb->jmp_lock, Alex Bennée, 2020/06/16
- [PULL 12/21] tests/docker: Added docker build support for TSan., Alex Bennée, 2020/06/16
- [PULL 10/21] translate-all: call qemu_spin_destroy for PageDesc, Alex Bennée, 2020/06/16
- [PULL 21/21] plugins: new lockstep plugin for debugging TCG changes, Alex Bennée, 2020/06/16
- [PULL 11/21] thread: add tsan annotations to QemuSpin, Alex Bennée, 2020/06/16
- [PULL 19/21] tests/tcg: build plugin list from contents of src directory,
Alex Bennée <=
- [PULL 15/21] docs: Added details on TSan to testing.rst, Alex Bennée, 2020/06/16
- [PULL 18/21] cirrus.yml: serialise make check, Alex Bennée, 2020/06/16
- [PULL 16/21] tests: Disable select tests under TSan, which hit TSan issue., Alex Bennée, 2020/06/16
- [PULL 17/21] Revert ".shippable: temporaily disable some cross builds", Alex Bennée, 2020/06/16
- [PULL 20/21] tests/tcg: ensure -cpu max also used for plugin run, Alex Bennée, 2020/06/16