From 81f53f989103c7e95186fa5d95807b34d360e620 Mon Sep 17 00:00:00 2001 From: Julian Sparber Date: Mon, 21 Nov 2022 12:24:34 +0100 Subject: [PATCH] tests: Ensure that plugins are build for tests that need them --- meson.build | 2 +- plugins/meson.build | 2 ++ tests/meson.build | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 8afb926..d19a903 100644 --- a/meson.build +++ b/meson.build @@ -130,8 +130,8 @@ add_project_arguments( subdir('po') subdir('src') -subdir('tests') subdir('plugins') +subdir('tests') subdir('doc') subdir('data') diff --git a/plugins/meson.build b/plugins/meson.build index d7a8e69..a5b93de 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -4,3 +4,5 @@ subdir('provider/dummy') subdir('provider/ofono') subdir('provider/sip') subdir('provider/tests') + +calls_plugins = [calls_mm, calls_dummy, calls_ofono, calls_sip] diff --git a/tests/meson.build b/tests/meson.build index bd4f5e7..1c9dca6 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -38,7 +38,7 @@ t = executable('manager', test_sources, calls_includes ] ) -test('manager', t, env: test_env) +test('manager', t, env: test_env, depends: calls_plugins) test_sources = [ 'test-plugins.c' ] @@ -53,7 +53,7 @@ t = executable('plugins', test_sources, calls_includes ] ) -test('plugins', t, env: test_env) +test('plugins', t, env: test_env, depends: calls_plugins) test_sources = [ 'test-util.c' ] t = executable('util', test_sources,