[PATCH] test/symbol-hiding: prepend new directory to LD_LIBRARY_PATH

diff --git a/a5/7a48a930d7ee72ea11097616940a748c5c6e0a b/a5/7a48a930d7ee72ea11097616940a748c5c6e0a
new file mode 100644 (file)
index 0000000..3f94d32
--- /dev/null
+++ b/a5/7a48a930d7ee72ea11097616940a748c5c6e0a
@@ -0,0 +1,66 @@
+Return-Path: <too@guru.guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5AAF8431FD0\r
+       for <notmuch@notmuchmail.org>; Fri, 30 Dec 2011 08:12:50 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id aOV2dn-S1U7M for <notmuch@notmuchmail.org>;\r
+       Fri, 30 Dec 2011 08:12:49 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])\r
+       by olra.theworths.org (Postfix) with ESMTP id B15F0431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 30 Dec 2011 08:12:49 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id B6DAA68055; Fri, 30 Dec 2011 18:12:50 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: <notmuch@notmuchmail.org>\r
+Subject: [PATCH] test/symbol-hiding: prepend new directory to LD_LIBRARY_PATH\r
+Date: Fri, 30 Dec 2011 18:12:45 +0200\r
+Message-Id: <1325261565-28030-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.7.6.1\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 30 Dec 2011 16:12:50 -0000\r
+\r
+Tester may have set LD_LIBRARY_PATH to find libraries required\r
+by notmuch. Therefore add $TEST_DIRECTORY/../lib to the beginning\r
+of current list of library paths in $LD_LIBRARY_PATH before running\r
+symbol-test.\r
+---\r
+ test/symbol-hiding |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/symbol-hiding b/test/symbol-hiding\r
+index 68f0d1b..7fa7b2a 100755\r
+--- a/test/symbol-hiding\r
++++ b/test/symbol-hiding\r
+@@ -12,7 +12,7 @@ test_description='exception symbol hiding'\r
+ . ./test-lib.sh\r
+ \r
+ run_test(){\r
+-    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)\r
++    result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
+ }\r
+ \r
+ output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'\r
+-- \r
+1.7.7.4\r
+\r