From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 30 Dec 2011 16:12:45 +0000 (+0200)
Subject: test/symbol-hiding: prepend new directory to LD_LIBRARY_PATH
X-Git-Tag: debian/0.12_rc1-1~253
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=347f39d73e2ab541b61d6e95b7feeebc6a1a453a

test/symbol-hiding: prepend new directory to LD_LIBRARY_PATH

Tester may have set LD_LIBRARY_PATH to find libraries required
by notmuch. Therefore add $TEST_DIRECTORY/../lib to the beginning
of current list of library paths in $LD_LIBRARY_PATH before running
symbol-test.
---

diff --git a/test/symbol-hiding b/test/symbol-hiding
index 68f0d1b1..7fa7b2aa 100755
--- a/test/symbol-hiding
+++ b/test/symbol-hiding
@@ -12,7 +12,7 @@ test_description='exception symbol hiding'
 . ./test-lib.sh
 
 run_test(){
-    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)
+    result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)
 }
 
 output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'