]> git.notmuchmail.org Git - notmuch/commitdiff
test/symbol-hiding: prepend new directory to LD_LIBRARY_PATH
authorTomi Ollila <tomi.ollila@iki.fi>
Fri, 30 Dec 2011 16:12:45 +0000 (18:12 +0200)
committerDavid Bremner <bremner@debian.org>
Sat, 31 Dec 2011 18:43:55 +0000 (14:43 -0400)
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.

test/symbol-hiding

index 68f0d1b183c9acd29f90721ced1960fd1eac4ffa..7fa7b2aaac5635945a7162e086f577d023951878 100755 (executable)
@@ -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'