From ab6f66d676581cb497e581e4af40e2fe5bff507b Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Mon, 8 Aug 2016 15:04:01 +0200 Subject: [PATCH] Prepend LD_LIBRARY_PATH for python tests * lang/python/tests/Makefile.am (TESTS_ENVIRONMENT): Prepend path instead of setting the value. -- This fixes the case where tools / libararies are needed for a working GnuPG system that are pointed to by LD_LIBRARY_PATH. E.g. GnuPG itself is installed in a custom prefix and PATH / LD_LIBRARY_PATH is set accordingly. --- lang/python/tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am index bc571fe4..83c4d8e0 100644 --- a/lang/python/tests/Makefile.am +++ b/lang/python/tests/Makefile.am @@ -26,7 +26,7 @@ test_srcdir = $(top_srcdir)/tests/gpg TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) \ LC_ALL=C GPG_AGENT_INFO= \ top_srcdir=$(top_srcdir) \ - LD_LIBRARY_PATH="../../../src/.libs" \ + LD_LIBRARY_PATH="../../../src/.libs:$(LD_LIBRARY_PATH)" \ PYTHONPATH=`echo $(abs_builddir)/../build/lib.*` py_tests = t-wrapper.py \