[PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.

diff --git a/d9/860844b81db9818fbded7e0cc291c3742a8073 b/d9/860844b81db9818fbded7e0cc291c3742a8073
new file mode 100644 (file)
index 0000000..39965fb
--- /dev/null
+++ b/d9/860844b81db9818fbded7e0cc291c3742a8073
@@ -0,0 +1,84 @@
+Return-Path: <cceleri@cs.stanford.edu>\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 DBF01431FBD\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 20:50:33 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 lR5o1P9rvdQm for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 20:50:26 -0700 (PDT)\r
+Received: from smtp3.cs.Stanford.EDU (smtp3.cs.Stanford.EDU [171.64.64.27])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8B2DC431FAE\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 20:50:26 -0700 (PDT)\r
+Received: from c-24-11-133-78.hsd1.sc.comcast.net ([24.11.133.78]\r
+       helo=jane.lan)\r
+       by smtp3.cs.Stanford.EDU with esmtpsa (TLSv1:DHE-RSA-SEED-SHA:128)\r
+       (Exim 4.80.1) (envelope-from <cceleri@cs.stanford.edu>)\r
+       id 1Whss9-0000I5-K4; Tue, 06 May 2014 20:50:22 -0700\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on\r
+       Mac OS X.\r
+Date: Tue,  6 May 2014 23:50:14 -0400\r
+Message-Id: <1399434615-28425-1-git-send-email-cceleri@cs.stanford.edu>\r
+X-Mailer: git-send-email 1.8.5.2 (Apple Git-48)\r
+In-Reply-To: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
+References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
+X-Scan-Signature: 6b0537b5faa14548adc1759647fcb4de\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: Wed, 07 May 2014 03:50:34 -0000\r
+\r
+The Mac OS X platform uses *.dylib object files instead of *.so object\r
+files for linking. Adding the path to notmuch.dylib to the end of\r
+DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to\r
+notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see\r
+dyld(1)).\r
+\r
+Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>\r
+---\r
+ test/T360-symbol-hiding.sh | 9 ++++++++-\r
+ 1 file changed, 8 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh\r
+index 636ec91..9239fc1 100755\r
+--- a/test/T360-symbol-hiding.sh\r
++++ b/test/T360-symbol-hiding.sh\r
+@@ -12,7 +12,14 @@ test_description='exception symbol hiding'\r
+ . ./test-lib.sh\r
+ \r
+ run_test(){\r
+-    result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
++    case $(uname -s) in\r
++    Darwin)\r
++        result=$(DYLD_FALLBACK_LIBRARY_PATH="$TEST_DIRECTORY/../lib${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
++        ;;\r
++    *)\r
++        result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
++        ;;\r
++    esac\r
+ }\r
+ \r
+ output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'\r
+-- \r
+1.8.5.2 (Apple Git-48)\r
+\r