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. Signed-off-by: Pierrick Bouvier <[email protected]>
pbo-linaro · Feb 19, 2025 · a375e9b · a375e9b
1 parent 646b428
commit a375e9b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
@@ -27,3 +27,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
@@ -3658,6 +3658,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
@@ -364,7 +364,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
@@ -19,3 +19,5 @@ if t.length() > 0
 else
   run_target('test-plugins', command: find_program('true'))
 endif
+
+plugin_modules += t
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,3 +27,5 @@ if t.length() > 0 @@
     else
       run_target('contrib-plugins', command: find_program('true'))
     endif
+    plugin_modules += t