From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 6 May 2014 19:09:05 +0000 (+0300)
Subject: Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on	Mac	OS X.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fd1c9999089fa0efdf3e7eaefc99802a41c7f40;p=notmuch-archives.git

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
index 000000000..aa958ea51
--- /dev/null
+++ b/93/856dede8ed2afc729ed48c5ce29f9fbe52f404
@@ -0,0 +1,123 @@
+Return-Path: <tomi.ollila@iki.fi>
+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 16B9C431FAF
+	for <notmuch@notmuchmail.org>; Tue,  6 May 2014 12:09:18 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	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 DUYYKJk2lNJZ for <notmuch@notmuchmail.org>;
+	Tue,  6 May 2014 12:09:10 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 1A3CF431FC2
+	for <notmuch@notmuchmail.org>; Tue,  6 May 2014 12:09:10 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 9472B1000E5;
+	Tue,  6 May 2014 22:09:05 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Charles Celerier <cceleri@cs.stanford.edu>, notmuch@notmuchmail.org
+Subject: Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing
+	on	Mac	OS X.
+In-Reply-To: <m2d2fqrc0v.fsf@jane.lan>
+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>
+	<m21tw6ix8o.fsf@guru.guru-group.fi> <m2d2fqrc0v.fsf@jane.lan>
+User-Agent: Notmuch/0.18+12~gbfbd199 (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Tue, 06 May 2014 22:09:05 +0300
+Message-ID: <m2ppjqhgha.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Tue, 06 May 2014 19:09:18 -0000
+
+On Tue, May 06 2014, Charles Celerier <cceleri@cs.stanford.edu> wrote:
+
+> Tomi Ollila <tomi.ollila@iki.fi> writes:
+>
+>> On Tue, May 06 2014, Charles Celerier <cceleri@cs.stanford.edu> 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.
+
+That would also be less confusing. 
+
+You could send a replacement patch 4/5 and use
+id:1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu
+as reply-to: let's see how nmbug sorts those patches, then :D
+
+Tomi
+
+
+>
+>>>
+>>> Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
+>>> ---
+>>>  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='exception symbol hiding'
+>>>  . ./test-lib.sh
+>>>  
+>>>  run_test(){
+>>> -    result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)
+>>> +    case $(uname -s) in
+>>> +    Darwin)
+>>> +        result=$(DYLD_FALLBACK_LIBRARY_PATH="${DYLD_FALLBACK_LIBRARY_PATH:+$DYLD_FALLBACK_LIBRARY_PATH:}$TEST_DIRECTORY/../lib" $TEST_DIRECTORY/symbol-test 2>&1)
+>>> +        ;;
+>>> +    *)
+>>> +        result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)
+>>> +        ;;
+>>> +    esac
+>>>  }
+>>>  
+>>>  output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
+>>> -- 
+>>> 1.8.5.2 (Apple Git-48)
+>>>
+>>> _______________________________________________
+>>> notmuch mailing list
+>>> notmuch@notmuchmail.org
+>>> http://notmuchmail.org/mailman/listinfo/notmuch
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch