From 8162463956acc96b5e4e7b80a6ffc0a96d92ff80 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 30 Nov 2016 10:01:05 +0000 Subject: [PATCH] tests: prepend to an existing LD_LIBRARY_PATH, GI_TYPELIB_PATH If we're using LD_LIBRARY_PATH for some locally-built library, we want to search those after OSTree's own libraries. Signed-off-by: Simon McVittie Closes: #606 Approved by: cgwalters --- Makefile-tests.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile-tests.am b/Makefile-tests.am index 03e50b9b..517f713b 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -28,8 +28,8 @@ EXTRA_DIST += \ # include the builddir in $PATH so we find our just-built ostree # binary. TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \ - GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \ - LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \ + GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH} \ + LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd)$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}} \ PATH=$$(cd $(top_builddir)/tests && pwd):$${PATH} \ $(NULL)