From 91b41f523450dba68d958fd715e670c0a8e77b0c Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Mon, 25 Sep 2023 19:15:04 +0200 Subject: [PATCH] tests/gutils-user-database: do not hardcode library name Use build_tgt.full_path() and import('fs').name() --- glib/tests/meson.build | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index e84e986d8..8525b10d7 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -226,23 +226,22 @@ else 'unix' : {}, } if have_rtld_next and glib_build_shared + getpwuid_preload = shared_library('getpwuid-preload', + 'getpwuid-preload.c', + name_prefix : '', + dependencies: libdl_dep, + install_dir : installed_tests_execdir, + install_tag : 'tests', + install: installed_tests_enabled) + glib_tests += { 'gutils-user-database' : { - 'depends' : [ - shared_library('getpwuid-preload', - 'getpwuid-preload.c', - name_prefix : '', - dependencies: libdl_dep, - install_dir : installed_tests_execdir, - install_tag : 'tests', - install: installed_tests_enabled, - ), - ], + 'depends' : [], 'env' : { - 'LD_PRELOAD': '@0@/getpwuid-preload.so'.format(meson.current_build_dir()), + 'LD_PRELOAD': getpwuid_preload.full_path() }, 'installed_tests_env' : { - 'LD_PRELOAD': '@0@/getpwuid-preload.so'.format(installed_tests_execdir), + 'LD_PRELOAD': installed_tests_execdir / fs.name(getpwuid_preload.full_path()) }, }, }