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>

diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
index 484b9a808c83d3aa71fc2a376dfaa66eda54705a..fa8a426c8b5940111adb11e923f568b673cd5167 100644 (file)
--- 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 4899d896de0b8bd4188191eda334af93c2a02833..9d9c11731f30c7dc7f98b9d019c906e51629c078 100644 (file)
--- 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 7fcc4731d5bac3ee269c989332b99f5ece4c5d1f..e78560a9011d5e1dc4e476f8724100d1d096240d 100644 (file)
--- 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 87a17d67bd4501f86990d834dcf81473b8ef0ae9..c8cb0626a6da51ad92bf01987ad213c5113991fd 100644 (file)
--- 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