[PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.
authorCharles Celerier <cceleri@cs.stanford.edu>
Tue, 6 May 2014 17:02:27 +0000 (13:02 +2000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:02:14 +0000 (10:02 -0800)
ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca [new file with mode: 0644]

diff --git a/ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca b/ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca
new file mode 100644 (file)
index 0000000..c953a1a
--- /dev/null
@@ -0,0 +1,97 @@
+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 0B810431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 10:03:09 -0700 (PDT)\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\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\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 Ev6sGkrV6NQq for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 10:03:03 -0700 (PDT)\r
+Received: from qmta14.westchester.pa.mail.comcast.net\r
+       (qmta14.westchester.pa.mail.comcast.net [76.96.59.212])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5FCC0431FCB\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 10:02:57 -0700 (PDT)\r
+Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74])\r
+       by qmta14.westchester.pa.mail.comcast.net with comcast\r
+       id yccu1n0031c6gX85Eh2x7h; Tue, 06 May 2014 17:02:57 +0000\r
+Received: from jane.lan ([24.11.133.78])\r
+       by omta23.westchester.pa.mail.comcast.net with comcast\r
+       id yh2W1n00e1heoKc3jh2w3Q; Tue, 06 May 2014 17:02:56 +0000\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac\r
+       OS X.\r
+Date: Tue,  6 May 2014 13:02:27 -0400\r
+Message-Id: <1399395748-44920-5-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-4-git-send-email-cceleri@cs.stanford.edu>\r
+References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
+       <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu>\r
+       <1399395748-44920-3-git-send-email-cceleri@cs.stanford.edu>\r
+       <1399395748-44920-4-git-send-email-cceleri@cs.stanford.edu>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1399395777;\r
+       bh=F68Oz3CtenkqPdVrWNXeTT6+q0p0HM8N7HIODarA7uc=;\r
+       h=Received:Received:From:To:Subject:Date:Message-Id;\r
+       b=TxlmF80sShPUHarOwtRJPb6MaSwrGZhXyLO23rEPp36iFp9WWzwESver2vYyUa1PY\r
+       USa3783rSs4y2M7GN2U1EsUcjGFQERTAkErYY8dZzDJVipF/m6+0yVNhyCpFHS7UKl\r
+       xWO+juFwm79nhqYnVgzG2dVesuF7GPDbvbME+9MH4Xcbm5ws7/YfUAPxOuL+2D0V7U\r
+       ZXT6YGazZqXi80psjJ4tVdV791mOS+XCIQHVVwTiTqrlH1eyMqd0IJ++rOkgaVmXIl\r
+       du0ambmrvdGjJ3RbK20crGqwFv8PzR6Go114JWlAS2aSb+1/wewqRruCVxB+hRcog5\r
+       95xBIKTLREP+w==\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: Tue, 06 May 2014 17:03:09 -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..97c734a 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="${DYLD_FALLBACK_LIBRARY_PATH:+$DYLD_FALLBACK_LIBRARY_PATH:}$TEST_DIRECTORY/../lib" $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