diff options
| author | Simon McVittie <smcv@debian.org> | 2016-11-30 10:01:05 +0000 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-12-01 14:23:40 +0000 |
| commit | 8162463956acc96b5e4e7b80a6ffc0a96d92ff80 (patch) | |
| tree | b27fea5bbf7b8dbb0c369da8ef2a636e46bf1ae3 /Makefile-tests.am | |
| parent | 62b94635bc54bb5725c7b12a551427bbcb56c207 (diff) | |
| download | ostree-8162463956acc96b5e4e7b80a6ffc0a96d92ff80.tar.gz | |
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 <smcv@debian.org>
Closes: #606
Approved by: cgwalters
Diffstat (limited to 'Makefile-tests.am')
| -rw-r--r-- | Makefile-tests.am | 4 |
1 files 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) |