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

diff --git a/88/610c02339508b7d53492ad4505fe715cc702d1 b/88/610c02339508b7d53492ad4505fe715cc702d1
new file mode 100644 (file)
index 0000000..6d1f48b
--- /dev/null
+++ b/88/610c02339508b7d53492ad4505fe715cc702d1
@@ -0,0 +1,143 @@
+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 C1593431FC2\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 11:57:45 -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 YVfQq2dGsu4G for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 11:57:37 -0700 (PDT)\r
+X-Greylist: delayed 1338 seconds by postgrey-1.32 at olra;\r
+       Tue, 06 May 2014 11:57:36 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 EEC8A431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 11:57:36 -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 (UNKNOWN:AES128-GCM-SHA256:128)\r
+       (Exim 4.80.1) (envelope-from <cceleri@cs.stanford.edu>)\r
+       id 1WhkCw-0000Kn-DC; Tue, 06 May 2014 11:35:15 -0700\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on\r
+       Mac     OS X.\r
+In-Reply-To: <m21tw6ix8o.fsf@guru.guru-group.fi>\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>\r
+User-Agent: Notmuch/0.18~rc0+5~gd63f00f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-apple-darwin13.1.0)\r
+Date: Tue, 06 May 2014 14:35:12 -0400\r
+Message-ID: <m2d2fqrc0v.fsf@jane.lan>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+X-Scan-Signature: ae7d61d5ad21aa0d569d6b6c8168eb46\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 18:57:45 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\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
+>>\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=3D'exception symbol hiding'\r
+>>  . ./test-lib.sh\r
+>>=20=20\r
+>>  run_test(){\r
+>> -    result=3D$(LD_LIBRARY_PATH=3D"$TEST_DIRECTORY/../lib${LD_LIBRARY_PA=\r
+TH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
+>> +    case $(uname -s) in\r
+>> +    Darwin)\r
+>> +        result=3D$(DYLD_FALLBACK_LIBRARY_PATH=3D"${DYLD_FALLBACK_LIBRAR=\r
+Y_PATH:+$DYLD_FALLBACK_LIBRARY_PATH:}$TEST_DIRECTORY/../lib" $TEST_DIRECTOR=\r
+Y/symbol-test 2>&1)\r
+>> +        ;;\r
+>> +    *)\r
+>> +        result=3D$(LD_LIBRARY_PATH=3D"$TEST_DIRECTORY/../lib${LD_LIBRAR=\r
+Y_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
+>> +        ;;\r
+>> +    esac\r
+>>  }\r
+>>=20=20\r
+>>  output=3D"A Xapian exception occurred opening database: Couldn't stat '=\r
+fakedb/.notmuch/xapian'\r
+>> --=20\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
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)\r
+\r
+iQIcBAEBAgAGBQJTaStgAAoJENf246HsgvBLt+MP/iRVilfIIttHpHghvoWEKI5n\r
+tLOmDFMyQryEUZceYRGWA+bc3s0boO2U59zLWb6P8HplW1QRlEcWadQS0sgLnnD+\r
+L8LliuvxTWDXCEfIt3klXUG6Sw1+FXFfNRGx0CzlMH9jsFU5QID+2uL9V310w9fK\r
+7h1zDfAgV0Hqz2iuEWaJrYCvcRQ8954jdhPRNiIQPXorZhqKtQ1evhsNNgqvHJ3s\r
+gR1K4UEXAAkkKwjXRyDUySPDRIVKHnZgA1NWe99DAiAK07aCBuNNpeb0mzRgVk2/\r
+5zPVugjrevo0l31m5HNBlcO238FBGWbjHLLL430IhqbipaFRBtUTNcOjyckN0y8C\r
+R488lHFucp/pUlnwcBTXu9PKFwbNYLhRarGt6HzpTwki9G6A3hl1CzxlZJqLS4Fn\r
+vVIJ9wiqv5i+/mL5HiL/reieA9iDQ0LT2lI7An/VhBYpxdjwoEsDGWWGPP6F/byD\r
+kNtlhGmDhadTNQBtfQs2i0Zee0AfPWp0S+x/Ij9EcJbUSe3EIAKp9fB2YwtUSUX+\r
+G3kV9ISu53o49xZu7X0lDXX628T6F4THkHAteixEbsnp98BDYTgIy5kkBFZ4A6K+\r
+s9iF7CGCHmOFyuKNF/bUy+NQRKlf9E6mtrbC7FRkBgC4V2mDsiUJ3kM3QLMxqXuw\r
+IsTIb8sosvzp6pcOIgYn\r
+=057y\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r