diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2016-05-26 00:37:40 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-06-11 13:11:49 -0300 |
| commit | f0e5317bcdc856739c5107705e3bc86b31b01d38 (patch) | |
| tree | 334013c5e65a378c207c18c827ee7b2fa8099186 /test/test-lib-common.sh | |
| parent | 65c219560f33d41f094a204c631fb5aa0ff3395e (diff) | |
test: set LD_LIBRARY_PATH early and keep its old contents
Previously LD_LIBRARY_PATH was exported (and environment changed)
in the middle of test case execution, when a function setting it
was called.
Previously the old contents of LD_LIBRARY_PATH was lost (if any)
when it was re-set and exported. In some systems the old contents of
LD_LIBRARY_PATH was needed to e.g. locate suitable gmime library.
Diffstat (limited to 'test/test-lib-common.sh')
| -rw-r--r-- | test/test-lib-common.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh index 0fdeeb72..03ef1d2d 100644 --- a/test/test-lib-common.sh +++ b/test/test-lib-common.sh @@ -58,6 +58,11 @@ restore_database () { TEST_DIRECTORY=$(pwd -P) notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"` +# Prepend $TEST_DIRECTORY/../lib to LD_LIBRARY_PATH, to make tests work +# on systems where ../notmuch depends on LD_LIBRARY_PATH. +LD_LIBRARY_PATH=${TEST_DIRECTORY%/*}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH + # configure output . $notmuch_path/sh.config || exit 1 |