[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/26] tests/tcg: add mechanism to handle plugin arguments
From: |
Alex Bennée |
Subject: |
[PATCH 05/26] tests/tcg: add mechanism to handle plugin arguments |
Date: |
Fri, 23 Jun 2023 13:20:39 +0100 |
We recently missed a regression that should have been picked up by
check-tcg. This was because the libmem plugin is effectively a NOP if
the user doesn't specify the type to use.
Rather than changing the default behaviour add an additional expansion
so we can take this into account in future.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
tests/tcg/Makefile.target | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index 72876cc84e..2462c26000 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -169,13 +169,17 @@ extract-plugin = $(wordlist 2, 2, $(subst -with-, ,$1))
RUN_TESTS+=$(EXTRA_RUNS)
+# Some plugins need additional arguments above the default to fully
+# exercise things. We can define them on a per-test basis here.
+run-plugin-%-with-libmem.so:
PLUGIN_ARGS=$(COMMA)inline=true$(COMMA)callback=true
+
ifeq ($(filter %-softmmu, $(TARGET)),)
run-%: %
$(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<)
run-plugin-%:
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
- -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \
-d plugin -D $*.pout \
$(call strip-plugin,$<))
else
@@ -189,7 +193,7 @@ run-plugin-%:
$(call run-test, $@, \
$(QEMU) -monitor none -display none \
-chardev file$(COMMA)path=$@.out$(COMMA)id=output \
- -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
+ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS)
\
-d plugin -D $*.pout \
$(QEMU_OPTS) $(call strip-plugin,$<))
endif
--
2.39.2
- [PATCH 00/26] maintainer omnibus: testing, fuzz, plugins, documentation, Alex Bennée, 2023/06/23
- [PATCH 03/26] gitlab: reduce testing scope of check-gcov, Alex Bennée, 2023/06/23
- [PATCH 01/26] gitlab: explicit set artifacts publishing criteria, Alex Bennée, 2023/06/23
- [PATCH 06/26] qemu-keymap: use modern name for Arabic keymap, Alex Bennée, 2023/06/23
- [PATCH 04/26] docs/devel: remind developers to run CI container pipeline when updating images, Alex Bennée, 2023/06/23
- [PATCH 02/26] gitlab: ensure coverage job also publishes meson log, Alex Bennée, 2023/06/23
- [PATCH 05/26] tests/tcg: add mechanism to handle plugin arguments,
Alex Bennée <=
- [PATCH 08/26] scripts/oss-fuzz: add a suppression for keymap, Alex Bennée, 2023/06/23
- [PATCH 12/26] tests/lcitool: update to latest version, Alex Bennée, 2023/06/23
- [PATCH 15/26] tests/lcitool: introduce qemu-minimal, Alex Bennée, 2023/06/23
- [PATCH 14/26] tests/lcitool: add an explicit gcc-native package, Alex Bennée, 2023/06/23
- [PATCH 07/26] qemu-keymap: properly check return from xkb_keymap_mod_get_index, Alex Bennée, 2023/06/23
- [PATCH 10/26] tests/docker: add test-fuzz, Alex Bennée, 2023/06/23
- [PATCH 09/26] tests/qtests: clean-up and fix leak in generic_fuzz, Alex Bennée, 2023/06/23
- [PATCH 16/26] tests/docker: convert riscv64-cross to lcitool, Alex Bennée, 2023/06/23