depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2025-01-09 13:25:35 +00:00
Code Issues Releases Wiki Activity

tests: Use CALLS_PLUGIN_DIR to search for plugins in the build dir

Browse source 
There is no need to add a second variable to search for plugins, we can
use CALLS_PLUGIN_DIR directly.
This commit is contained in:
Julian Sparber 2022-11-19 14:08:11 +01:00 committed by Evangelos Ribeiro Tzaras
parent 1d873a4b05
commit 74204393ff
6 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -47,8 +47,6 @@ full_servicedir = join_paths(prefix, get_option('datadir'), 'dbus-1', 'services'
localedir = get_option('localedir') localedir = get_option('localedir')
full_localedir = join_paths(prefix, localedir) full_localedir = join_paths(prefix, localedir)
full_calls_plugin_libdir = join_paths(prefix, libdir, calls_name, 'plugins') full_calls_plugin_libdir = join_paths(prefix, libdir, calls_name, 'plugins')
# Path to plugins inside the build dir, used for testing
full_calls_plugin_builddir = join_paths(builddir, 'plugins')
libcall_ui_dep = dependency('call-ui', libcall_ui_dep = dependency('call-ui',
fallback: ['libcall-ui', 'libcall_ui_dep'], fallback: ['libcall-ui', 'libcall_ui_dep'],

2
plugins/provider/tests/meson.build
View file

@ -32,12 +32,12 @@ test_env = [
'CALLS_AUDIOSRC=audiotestsrc', 'CALLS_AUDIOSRC=audiotestsrc',
'CALLS_AUDIOSINK=fakesink', 'CALLS_AUDIOSINK=fakesink',
'GSETTINGS_SCHEMA_DIR=@0@/data'.format(meson.project_build_root()), 'GSETTINGS_SCHEMA_DIR=@0@/data'.format(meson.project_build_root()),
'CALLS_PLUGIN_DIR=@0@/plugins'.format(meson.project_build_root()),
] ]
test_cflags = [ test_cflags = [
'-DFOR_TESTING', '-DFOR_TESTING',
'-Wno-error=deprecated-declarations', '-Wno-error=deprecated-declarations',
'-DPLUGIN_BUILDDIR="@0@"'.format(full_calls_plugin_builddir),
] ]
test_link_args = [ test_link_args = [

4
plugins/provider/tests/test-sip.c
View file

@ -429,10 +429,6 @@ main (int argc,
gtk_test_init (&argc, &argv, NULL); gtk_test_init (&argc, &argv, NULL);
gst_init (NULL, NULL); gst_init (NULL, NULL);
#ifdef PLUGIN_BUILDDIR
peas_engine_add_search_path (peas_engine_get_default (), PLUGIN_BUILDDIR, NULL);
#endif
/* this is a workaround for an issue with sofia: https://github.com/freeswitch/sofia-sip/issues/58 */ /* this is a workaround for an issue with sofia: https://github.com/freeswitch/sofia-sip/issues/58 */
su_random64 (); su_random64 ();

2
tests/meson.build
View file

@ -9,12 +9,12 @@ test_env = [
'MALLOC_CHECK_=2', 'MALLOC_CHECK_=2',
'NO_AT_BRIDGE=1', 'NO_AT_BRIDGE=1',
'GSETTINGS_SCHEMA_DIR=@0@/data'.format(meson.project_build_root()), 'GSETTINGS_SCHEMA_DIR=@0@/data'.format(meson.project_build_root()),
'CALLS_PLUGIN_DIR=@0@/plugins'.format(meson.project_build_root()),
] ]
test_cflags = [ test_cflags = [
'-DFOR_TESTING', '-DFOR_TESTING',
'-Wno-error=deprecated-declarations', '-Wno-error=deprecated-declarations',
'-DPLUGIN_BUILDDIR="@0@"'.format(full_calls_plugin_builddir),
] ]
test_link_args = [ test_link_args = [

6
tests/test-manager.c
View file

@ -262,12 +262,6 @@ main (gint argc,
gtk_test_init (&argc, &argv, NULL); gtk_test_init (&argc, &argv, NULL);
/* Add builddir as search path */
#ifdef PLUGIN_BUILDDIR
plugin_dir_provider = g_build_filename (PLUGIN_BUILDDIR, "provider", NULL);
peas_engine_add_search_path (peas_engine_get_default (), plugin_dir_provider, NULL);
#endif
g_test_add_func("/Calls/Manager/without_provider", test_calls_manager_without_provider); g_test_add_func("/Calls/Manager/without_provider", test_calls_manager_without_provider);
g_test_add_func("/Calls/Manager/dummy_provider", test_calls_manager_dummy_provider); g_test_add_func("/Calls/Manager/dummy_provider", test_calls_manager_dummy_provider);
g_test_add_func("/Calls/Manager/mm_provider", test_calls_manager_mm_provider); g_test_add_func("/Calls/Manager/mm_provider", test_calls_manager_mm_provider);

18
tests/test-plugins.c
View file

@ -48,7 +48,6 @@ gint
main (gint argc, main (gint argc,
gchar *argv[]) gchar *argv[])
{ {
g_autofree char *plugin_dir_provider = NULL;
PeasEngine *peas; PeasEngine *peas;
const gchar *dir; const gchar *dir;
g_autofree char *default_plugin_dir_provider = NULL; g_autofree char *default_plugin_dir_provider = NULL;
@ -57,11 +56,18 @@ main (gint argc,
peas = peas_engine_get_default (); peas = peas_engine_get_default ();
/* Add builddir as search path */ dir = g_getenv ("CALLS_PLUGIN_DIR");
#ifdef PLUGIN_BUILDDIR if (dir && dir[0] != '\0') {
plugin_dir_provider = g_build_filename (PLUGIN_BUILDDIR, "provider", NULL); g_autofree char *plugin_dir_provider = NULL;
peas_engine_add_search_path (peas_engine_get_default (), plugin_dir_provider, NULL); plugin_dir_provider = g_build_filename (dir, "provider", NULL);
#endif g_debug ("Adding %s to plugin search path", plugin_dir_provider);
peas_engine_prepend_search_path (peas, plugin_dir_provider, NULL);
}
default_plugin_dir_provider = g_build_filename (PLUGIN_LIBDIR, "provider", NULL);
g_debug ("Adding %s to plugin search path", default_plugin_dir_provider);
peas_engine_add_search_path (peas, default_plugin_dir_provider, NULL);
peas_engine_rescan_plugins (peas);
dir = g_getenv ("CALLS_PLUGIN_DIR"); dir = g_getenv ("CALLS_PLUGIN_DIR");
if (dir && dir[0] != '\0') { if (dir && dir[0] != '\0') {