From: Tomi Ollila Date: Tue, 6 May 2014 18:21:43 +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=46c0d172bb47459c7322f4353a8e28c2c380420d;p=notmuch-archives.git Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X. --- diff --git a/3c/567764ffa896bad97467d50e80650d6b77ecc1 b/3c/567764ffa896bad97467d50e80650d6b77ecc1 new file mode 100644 index 000000000..c23192d81 --- /dev/null +++ b/3c/567764ffa896bad97467d50e80650d6b77ecc1 @@ -0,0 +1,104 @@ +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 DB42D431FC2 + for ; Tue, 6 May 2014 11:21:56 -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 CeUt1mjVvkIc for ; + Tue, 6 May 2014 11:21:50 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 480F8431FAF + for ; Tue, 6 May 2014 11:21:50 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 367181000E5; + Tue, 6 May 2014 21:21:44 +0300 (EEST) +From: Tomi Ollila +To: Charles Celerier , notmuch@notmuchmail.org +Subject: Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on + Mac OS X. +In-Reply-To: <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu> +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+12~gbfbd199 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 06 May 2014 18:21:57 -0000 + +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 + +Tomi + + +> +> 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='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