From e9c4e19671e7a035d62a61bb522f3791abfba741 Mon Sep 17 00:00:00 2001 From: Charles Celerier Date: Wed, 7 May 2014 14:35:12 +2000 Subject: [PATCH] Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X. --- 88/610c02339508b7d53492ad4505fe715cc702d1 | 143 ++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 88/610c02339508b7d53492ad4505fe715cc702d1 diff --git a/88/610c02339508b7d53492ad4505fe715cc702d1 b/88/610c02339508b7d53492ad4505fe715cc702d1 new file mode 100644 index 000000000..6d1f48b44 --- /dev/null +++ b/88/610c02339508b7d53492ad4505fe715cc702d1 @@ -0,0 +1,143 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C1593431FC2 + for ; Tue, 6 May 2014 11:57:45 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id YVfQq2dGsu4G for ; + Tue, 6 May 2014 11:57:37 -0700 (PDT) +X-Greylist: delayed 1338 seconds by postgrey-1.32 at olra; + Tue, 06 May 2014 11:57:36 PDT +Received: from smtp3.cs.Stanford.EDU (smtp3.cs.Stanford.EDU [171.64.64.27]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id EEC8A431FAF + for ; Tue, 6 May 2014 11:57:36 -0700 (PDT) +Received: from c-24-11-133-78.hsd1.sc.comcast.net ([24.11.133.78] + helo=jane.lan) + by smtp3.cs.Stanford.EDU with esmtpsa (UNKNOWN:AES128-GCM-SHA256:128) + (Exim 4.80.1) (envelope-from ) + id 1WhkCw-0000Kn-DC; Tue, 06 May 2014 11:35:15 -0700 +From: Charles Celerier +To: Tomi Ollila , notmuch@notmuchmail.org +Subject: Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on + Mac OS X. +In-Reply-To: +References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-3-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-4-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu> + +User-Agent: Notmuch/0.18~rc0+5~gd63f00f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-apple-darwin13.1.0) +Date: Tue, 06 May 2014 14:35:12 -0400 +Message-ID: +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha1; protocol="application/pgp-signature" +X-Scan-Signature: ae7d61d5ad21aa0d569d6b6c8168eb46 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 06 May 2014 18:57:45 -0000 + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +Tomi Ollila writes: + +> On Tue, May 06 2014, Charles Celerier wrote: +> +>> The Mac OS X platform uses *.dylib object files instead of *.so object +>> files for linking. Adding the path to notmuch.dylib to the end of +>> DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to +>> notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see +>> dyld(1)). +> +> This series LGTM. I don't understand this difference suffixing +> DYLD_FALLBACK_LIBRARY_PATH with $TEST_DIRECTORY/../lib on Mac OS X +> compared to prefixing LD_LIBRARY_PATH with the same on other +> systems, so I take your word that it works :D + +I just went back and read dyld(1) again. Prefixing would be fine, and I +agree it would look cleaner. + +>> +>> Signed-off-by: Charles Celerier +>> --- +>> test/T360-symbol-hiding.sh | 9 ++++++++- +>> 1 file changed, 8 insertions(+), 1 deletion(-) +>> +>> diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh +>> index 636ec91..97c734a 100755 +>> --- a/test/T360-symbol-hiding.sh +>> +++ b/test/T360-symbol-hiding.sh +>> @@ -12,7 +12,14 @@ test_description=3D'exception symbol hiding' +>> . ./test-lib.sh +>>=20=20 +>> run_test(){ +>> - result=3D$(LD_LIBRARY_PATH=3D"$TEST_DIRECTORY/../lib${LD_LIBRARY_PA= +TH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1) +>> + case $(uname -s) in +>> + Darwin) +>> + result=3D$(DYLD_FALLBACK_LIBRARY_PATH=3D"${DYLD_FALLBACK_LIBRAR= +Y_PATH:+$DYLD_FALLBACK_LIBRARY_PATH:}$TEST_DIRECTORY/../lib" $TEST_DIRECTOR= +Y/symbol-test 2>&1) +>> + ;; +>> + *) +>> + result=3D$(LD_LIBRARY_PATH=3D"$TEST_DIRECTORY/../lib${LD_LIBRAR= +Y_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1) +>> + ;; +>> + esac +>> } +>>=20=20 +>> output=3D"A Xapian exception occurred opening database: Couldn't stat '= +fakedb/.notmuch/xapian' +>> --=20 +>> 1.8.5.2 (Apple Git-48) +>> +>> _______________________________________________ +>> notmuch mailing list +>> notmuch@notmuchmail.org +>> http://notmuchmail.org/mailman/listinfo/notmuch + +--=-=-= +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) + +iQIcBAEBAgAGBQJTaStgAAoJENf246HsgvBLt+MP/iRVilfIIttHpHghvoWEKI5n +tLOmDFMyQryEUZceYRGWA+bc3s0boO2U59zLWb6P8HplW1QRlEcWadQS0sgLnnD+ +L8LliuvxTWDXCEfIt3klXUG6Sw1+FXFfNRGx0CzlMH9jsFU5QID+2uL9V310w9fK +7h1zDfAgV0Hqz2iuEWaJrYCvcRQ8954jdhPRNiIQPXorZhqKtQ1evhsNNgqvHJ3s +gR1K4UEXAAkkKwjXRyDUySPDRIVKHnZgA1NWe99DAiAK07aCBuNNpeb0mzRgVk2/ +5zPVugjrevo0l31m5HNBlcO238FBGWbjHLLL430IhqbipaFRBtUTNcOjyckN0y8C +R488lHFucp/pUlnwcBTXu9PKFwbNYLhRarGt6HzpTwki9G6A3hl1CzxlZJqLS4Fn +vVIJ9wiqv5i+/mL5HiL/reieA9iDQ0LT2lI7An/VhBYpxdjwoEsDGWWGPP6F/byD +kNtlhGmDhadTNQBtfQs2i0Zee0AfPWp0S+x/Ij9EcJbUSe3EIAKp9fB2YwtUSUX+ +G3kV9ISu53o49xZu7X0lDXX628T6F4THkHAteixEbsnp98BDYTgIy5kkBFZ4A6K+ +s9iF7CGCHmOFyuKNF/bUy+NQRKlf9E6mtrbC7FRkBgC4V2mDsiUJ3kM3QLMxqXuw +IsTIb8sosvzp6pcOIgYn +=057y +-----END PGP SIGNATURE----- +--=-=-=-- -- 2.26.2