diff options
| author | Pierrick Bouvier <pierrick.bouvier@linaro.org> | 2025-03-04 22:24:15 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2025-03-10 10:30:00 +0000 |
| commit | 892b06c40e46656b07579b9f4fb7a8f2652cacf2 (patch) | |
| tree | 71529fb89a88da3397076725c1e2e14ec84929a3 | |
| parent | d69178d3705994c1e4f7f919dfb6dd31b8b11d80 (diff) | |
| download | qemu-892b06c40e46656b07579b9f4fb7a8f2652cacf2.zip qemu-892b06c40e46656b07579b9f4fb7a8f2652cacf2.tar.gz qemu-892b06c40e46656b07579b9f4fb7a8f2652cacf2.tar.bz2 | |
plugins: add explicit dependency in functional tests
./tests/functional/test_aarch64_tcg_plugins.py needs to have plugin
libinsn built. However, it's not listed as a dependency, so meson can't
know it needs to be built.
Thus, we keep track of all plugins, and add them as an explicit
dependency.
Fixes: 4c134d07b9e ("tests: add a new set of tests to exercise plugins")
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250304222439.2035603-9-alex.bennee@linaro.org>
| -rw-r--r-- | contrib/plugins/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | tests/functional/meson.build | 2 | ||||
| -rw-r--r-- | tests/tcg/plugins/meson.build | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build index 484b9a8..fa8a426 100644 --- a/contrib/plugins/meson.build +++ b/contrib/plugins/meson.build @@ -26,3 +26,5 @@ if t.length() > 0 else run_target('contrib-plugins', command: find_program('true')) endif + +plugin_modules += t diff --git a/meson.build b/meson.build index 4899d89..9d9c117 100644 --- a/meson.build +++ b/meson.build @@ -3668,6 +3668,7 @@ qtest_module_ss = ss.source_set() modules = {} target_modules = {} +plugin_modules = [] hw_arch = {} target_arch = {} target_system_arch = {} diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 7fcc473..e78560a 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -385,7 +385,7 @@ foreach speed : ['quick', 'thorough'] # 'run_target' logic below & in Makefile.include test('func-' + testname, python, - depends: [test_deps, test_emulator, emulator_modules], + depends: [test_deps, test_emulator, emulator_modules, plugin_modules], env: test_env, args: [testpath], protocol: 'tap', diff --git a/tests/tcg/plugins/meson.build b/tests/tcg/plugins/meson.build index 87a17d6..c8cb062 100644 --- a/tests/tcg/plugins/meson.build +++ b/tests/tcg/plugins/meson.build @@ -19,3 +19,5 @@ if t.length() > 0 else run_target('test-plugins', command: find_program('true')) endif + +plugin_modules += t |