From fe12e8ab6fb788cfa84cef4c51b8f01e3d3329a6 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis <george.kiagiadakis@collabora.com> Date: Wed, 22 Apr 2020 18:36:15 +0300 Subject: [PATCH] tests: enable WIREPLUMBER_DEBUG and set WIREPLUMBER_MODULE_DIR by default + better logs by default + allow loading modules in tests --- tests/modules/meson.build | 15 ++++++++++----- tests/wp/meson.build | 2 ++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/modules/meson.build b/tests/modules/meson.build index 65db1736..e8b60d98 100644 --- a/tests/modules/meson.build +++ b/tests/modules/meson.build @@ -2,6 +2,11 @@ common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep] common_env = [ 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), + 'WIREPLUMBER_MODULE_DIR=@0@'.format(meson.current_build_dir() / '..' / '..' / 'modules'), + 'WIREPLUMBER_DEBUG=7', +] +common_args = [ + '-DG_LOG_USE_STRUCTURED', ] test( @@ -11,7 +16,7 @@ test( 'algorithms.c', '../../modules/module-pipewire/algorithms.c' ], - dependencies: common_deps), + dependencies: common_deps, c_args: common_args), env: common_env, ) @@ -23,7 +28,7 @@ test( '../../modules/module-config-static-nodes/parser-node.c', '../../modules/module-config-static-nodes/context.c', ], - dependencies: common_deps + [wptoml_dep]), + dependencies: common_deps + [wptoml_dep], c_args: common_args), env: common_env, workdir : meson.current_source_dir(), ) @@ -38,7 +43,7 @@ test( '../../modules/module-config-endpoint/parser-streams.c', '../../modules/module-config-endpoint/context.c', ], - dependencies: common_deps + [wptoml_dep]), + dependencies: common_deps + [wptoml_dep], c_args: common_args), env: common_env, workdir : meson.current_source_dir(), ) @@ -54,7 +59,7 @@ test( '../../modules/module-config-policy/config-policy.c', '../../modules/module-config-policy/parser-endpoint-link.c' ], - dependencies: common_deps + [wptoml_dep]), + dependencies: common_deps + [wptoml_dep], c_args: common_args), env: common_env, workdir : meson.current_source_dir(), ) @@ -67,7 +72,7 @@ test( '../../modules/module-monitor/dbus-device-reservation.c', reserve_device_interface_src, ], - dependencies: common_deps + [giounix_dep]), + dependencies: common_deps + [giounix_dep], c_args: common_args), env: common_env, workdir : meson.current_source_dir(), ) diff --git a/tests/wp/meson.build b/tests/wp/meson.build index ef457597..a6e30e16 100644 --- a/tests/wp/meson.build +++ b/tests/wp/meson.build @@ -2,6 +2,8 @@ common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep] common_env = [ 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), + 'WIREPLUMBER_MODULE_DIR=@0@'.format(meson.current_build_dir() / '..' / '..' / 'modules'), + 'WIREPLUMBER_DEBUG=7', ] common_args = [ '-DG_LOG_USE_STRUCTURED', -- GitLab