From 3184fa3af04e2681480eebd7176e8add92edda64 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Tue, 14 Oct 2025 17:08:35 +0200 Subject: [PATCH] tests: Depend on .plugin files to exist When .plugin files are missing, the plugins will not be discoverable. These were only getting built when run with `meson compile`, but not for `meson test`. Helps: https://gitlab.gnome.org/GNOME/calls/-/issues/719 Signed-off-by: Evangelos Ribeiro Tzaras Part-of: --- plugins/meson.build | 3 +++ plugins/provider/dummy/meson.build | 1 + plugins/provider/mm/meson.build | 1 + plugins/provider/ofono/meson.build | 2 ++ plugins/provider/sip/meson.build | 1 + tests/meson.build | 8 ++++++-- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/meson.build b/plugins/meson.build index a5b93de..ab89269 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,4 +1,7 @@ calls_provider_plugin_libdir = join_paths(full_calls_plugin_libdir, 'provider') + +plugins_test_depends = [] + subdir('provider/mm') subdir('provider/dummy') subdir('provider/ofono') diff --git a/plugins/provider/dummy/meson.build b/plugins/provider/dummy/meson.build index b4de5e8..4c36f3c 100644 --- a/plugins/provider/dummy/meson.build +++ b/plugins/provider/dummy/meson.build @@ -41,6 +41,7 @@ i18n_plugin = i18n.merge_file( install_dir: dummy_install_dir, ) +plugins_test_depends += [i18n_plugin] dummy_deps = [ dependency('gobject-2.0'), diff --git a/plugins/provider/mm/meson.build b/plugins/provider/mm/meson.build index 0bd0675..eacd166 100644 --- a/plugins/provider/mm/meson.build +++ b/plugins/provider/mm/meson.build @@ -39,6 +39,7 @@ i18n_plugin = i18n.merge_file( install_dir: mm_install_dir, ) +plugins_test_depends += [i18n_plugin] mm_deps = [ dependency('gobject-2.0'), diff --git a/plugins/provider/ofono/meson.build b/plugins/provider/ofono/meson.build index b63acf1..e6fc757 100644 --- a/plugins/provider/ofono/meson.build +++ b/plugins/provider/ofono/meson.build @@ -41,6 +41,8 @@ i18n_plugin = i18n.merge_file( install_dir: ofono_install_dir, ) +plugins_test_depends += [i18n_plugin] + ofono_deps = [ dependency('gobject-2.0'), dependency('gtk4', version: '>= @0@'.format(gtk_version)), diff --git a/plugins/provider/sip/meson.build b/plugins/provider/sip/meson.build index db6a2e0..e477378 100644 --- a/plugins/provider/sip/meson.build +++ b/plugins/provider/sip/meson.build @@ -41,6 +41,7 @@ i18n_plugin = i18n.merge_file( install_dir: sip_install_dir, ) +plugins_test_depends += [i18n_plugin] sip_deps = [ dependency('gobject-2.0'), diff --git a/tests/meson.build b/tests/meson.build index 0cc993e..a67f0cb 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -48,11 +48,15 @@ subdir('services') tests = [ ['emergency-call-types', ['test-emergency-call-types.c']], - ['manager', ['test-manager.c'], {'extra_test_deps' : [calls_plugins]}], + [ + 'manager', + ['test-manager.c'], + {'extra_test_deps' : [calls_plugins, plugins_test_depends]}, + ], [ 'plugins', ['test-plugins.c', calls_sources], - {'extra_test_deps' : [calls_plugins]}, + {'extra_test_deps' : [calls_plugins, plugins_test_depends]}, ], ['util', ['test-util.c']], ['ui-call', ['test-ui-call.c', 'mock-call.c']],