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

diff --git a/93/856dede8ed2afc729ed48c5ce29f9fbe52f404 b/93/856dede8ed2afc729ed48c5ce29f9fbe52f404
new file mode 100644 (file)
index 0000000..aa958ea
--- /dev/null
+++ b/93/856dede8ed2afc729ed48c5ce29f9fbe52f404
@@ -0,0 +1,123 @@
+Return-Path: <tomi.ollila@iki.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 16B9C431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 12:09:18 -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 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 DUYYKJk2lNJZ for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 12:09:10 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1A3CF431FC2\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 12:09:10 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 9472B1000E5;\r
+       Tue,  6 May 2014 22:09:05 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Charles Celerier <cceleri@cs.stanford.edu>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing\r
+       on      Mac     OS X.\r
+In-Reply-To: <m2d2fqrc0v.fsf@jane.lan>\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
+       <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu>\r
+       <m21tw6ix8o.fsf@guru.guru-group.fi> <m2d2fqrc0v.fsf@jane.lan>\r
+User-Agent: Notmuch/0.18+12~gbfbd199 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 06 May 2014 22:09:05 +0300\r
+Message-ID: <m2ppjqhgha.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 19:09:18 -0000\r
+\r
+On Tue, May 06 2014, Charles Celerier <cceleri@cs.stanford.edu> wrote:\r
+\r
+> Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+>\r
+>> On Tue, May 06 2014, Charles Celerier <cceleri@cs.stanford.edu> wrote:\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
+>> This series LGTM. I don't understand this difference suffixing\r
+>> DYLD_FALLBACK_LIBRARY_PATH with $TEST_DIRECTORY/../lib on Mac OS X\r
+>> compared to prefixing LD_LIBRARY_PATH with the same on other\r
+>> systems, so I take your word that it works :D\r
+>\r
+> I just went back and read dyld(1) again. Prefixing would be fine, and I\r
+> agree it would look cleaner.\r
+\r
+That would also be less confusing. \r
+\r
+You could send a replacement patch 4/5 and use\r
+id:1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu\r
+as reply-to: let's see how nmbug sorts those patches, then :D\r
+\r
+Tomi\r
+\r
+\r
+>\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
+>>> _______________________________________________\r
+>>> notmuch mailing list\r
+>>> notmuch@notmuchmail.org\r
+>>> http://notmuchmail.org/mailman/listinfo/notmuch\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r