From 27302dc5a5aa659c30df5b14293fb3e67a11454f Mon Sep 17 00:00:00 2001 From: Julian Sparber Date: Sat, 19 Nov 2022 15:54:43 +0100 Subject: [PATCH] tests: Make ringer test depend on mocked libfeedback This makes sure that the mocked libfeedback library is build before running tests and drops the need of LD_PRELOAD. --- tests/meson.build | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index c592318..bd4f5e7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -81,10 +81,6 @@ t = executable('ui-call', test_sources, ) test('ui-call', t, env: test_env) -test_env_ringer = [ - 'LD_PRELOAD=@0@/mock/lfb/libfeedback-0.so'.format(meson.current_build_dir()), -] + test_env - test_sources = [ 'mock-call.c', 'mock-call.h', 'mock-libfeedback.h', 'test-ringer.c' @@ -94,13 +90,13 @@ t = executable('ringer', test_sources, c_args : test_cflags, link_args: mock_link_args, pie: true, - link_with : [calls_vala, libcalls], + link_with : [calls_vala, libcalls, libfeedback], dependencies: calls_deps, include_directories : [ calls_includes, ] ) -test('ringer', t, env: test_env_ringer) +test('ringer', t, env: test_env) test_sources = [ 'test-contacts.c' ] t = executable('contacts', test_sources,