tests/tcg: move test plugins into tcg subdir
You cannot use plugins without TCG enabled so it doesn't make sense to have them separated off in the test directory structure. While we are at it rename the directory to plugins to reflect the plural nature of the directory and match up with contrib/plugins. Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20240729144414.830369-10-alex.bennee@linaro.org>
This commit is contained in:
parent
6908e4a28b
commit
1b4c136b78
@ -3751,7 +3751,7 @@ R: Pierrick Bouvier <pierrick.bouvier@linaro.org>
|
||||
S: Maintained
|
||||
F: docs/devel/tcg-plugins.rst
|
||||
F: plugins/
|
||||
F: tests/plugin/
|
||||
F: tests/tcg/plugins/
|
||||
F: tests/avocado/tcg_plugins.py
|
||||
F: contrib/plugins/
|
||||
|
||||
|
@ -77,7 +77,7 @@ class PluginKernelNormal(PluginKernelBase):
|
||||
suffix=".log")
|
||||
|
||||
self.run_vm(kernel_path, kernel_command_line,
|
||||
"tests/plugin/libinsn.so", plugin_log.name,
|
||||
"tests/tcg/plugins/libinsn.so", plugin_log.name,
|
||||
console_pattern)
|
||||
|
||||
with plugin_log as lf, \
|
||||
@ -107,7 +107,7 @@ class PluginKernelNormal(PluginKernelBase):
|
||||
suffix=".log")
|
||||
|
||||
self.run_vm(kernel_path, kernel_command_line,
|
||||
"tests/plugin/libinsn.so", plugin_log.name,
|
||||
"tests/tcg/plugins/libinsn.so", plugin_log.name,
|
||||
console_pattern,
|
||||
args=('-icount', 'shift=1'))
|
||||
|
||||
|
@ -78,7 +78,7 @@ subdir('decode')
|
||||
|
||||
if 'CONFIG_TCG' in config_all_accel
|
||||
subdir('fp')
|
||||
subdir('plugin')
|
||||
subdir('tcg/plugins')
|
||||
endif
|
||||
|
||||
subdir('unit')
|
||||
|
@ -142,8 +142,8 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS))
|
||||
|
||||
# If plugins exist also include those in the tests
|
||||
ifeq ($(CONFIG_PLUGIN),y)
|
||||
PLUGIN_SRC=$(SRC_PATH)/tests/plugin
|
||||
PLUGIN_LIB=../../plugin
|
||||
PLUGIN_SRC=$(SRC_PATH)/tests/tcg/plugins
|
||||
PLUGIN_LIB=../plugins
|
||||
VPATH+=$(PLUGIN_LIB)
|
||||
PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c)))
|
||||
|
||||
|
@ -2,15 +2,15 @@ t = []
|
||||
if get_option('plugins')
|
||||
foreach i : ['bb', 'empty', 'inline', 'insn', 'mem', 'syscall']
|
||||
if host_os == 'windows'
|
||||
t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c',
|
||||
include_directories: '../../include/qemu',
|
||||
t += shared_module(i, files(i + '.c') + '../../../contrib/plugins/win32_linker.c',
|
||||
include_directories: '../../../include/qemu',
|
||||
link_depends: [win32_qemu_plugin_api_lib],
|
||||
link_args: ['-Lplugins', '-lqemu_plugin_api'],
|
||||
dependencies: glib)
|
||||
|
||||
else
|
||||
t += shared_module(i, files(i + '.c'),
|
||||
include_directories: '../../include/qemu',
|
||||
include_directories: '../../../include/qemu',
|
||||
dependencies: glib)
|
||||
endif
|
||||
endforeach
|
Loading…
x
Reference in New Issue
Block a user