From c08857cb04b32a92d90c1de04c3dd437a61c02c7 Mon Sep 17 00:00:00 2001 From: Charles Celerier Date: Wed, 7 May 2014 13:02:27 +2000 Subject: [PATCH] [PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X. --- ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca diff --git a/ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca b/ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca new file mode 100644 index 000000000..c953a1aba --- /dev/null +++ b/ea/c0e432acb7b7e3271a2fdaa5c9371ffc8e4bca @@ -0,0 +1,97 @@ +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 0B810431FAF + for ; Tue, 6 May 2014 10:03:09 -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=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] + 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 Ev6sGkrV6NQq for ; + Tue, 6 May 2014 10:03:03 -0700 (PDT) +Received: from qmta14.westchester.pa.mail.comcast.net + (qmta14.westchester.pa.mail.comcast.net [76.96.59.212]) + by olra.theworths.org (Postfix) with ESMTP id 5FCC0431FCB + for ; Tue, 6 May 2014 10:02:57 -0700 (PDT) +Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74]) + by qmta14.westchester.pa.mail.comcast.net with comcast + id yccu1n0031c6gX85Eh2x7h; Tue, 06 May 2014 17:02:57 +0000 +Received: from jane.lan ([24.11.133.78]) + by omta23.westchester.pa.mail.comcast.net with comcast + id yh2W1n00e1heoKc3jh2w3Q; Tue, 06 May 2014 17:02:56 +0000 +From: Charles Celerier +To: notmuch@notmuchmail.org +Subject: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac + OS X. +Date: Tue, 6 May 2014 13:02:27 -0400 +Message-Id: <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu> +X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) +In-Reply-To: <1399395748-44920-4-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> +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1399395777; + bh=F68Oz3CtenkqPdVrWNXeTT6+q0p0HM8N7HIODarA7uc=; + h=Received:Received:From:To:Subject:Date:Message-Id; + b=TxlmF80sShPUHarOwtRJPb6MaSwrGZhXyLO23rEPp36iFp9WWzwESver2vYyUa1PY + USa3783rSs4y2M7GN2U1EsUcjGFQERTAkErYY8dZzDJVipF/m6+0yVNhyCpFHS7UKl + xWO+juFwm79nhqYnVgzG2dVesuF7GPDbvbME+9MH4Xcbm5ws7/YfUAPxOuL+2D0V7U + ZXT6YGazZqXi80psjJ4tVdV791mOS+XCIQHVVwTiTqrlH1eyMqd0IJ++rOkgaVmXIl + du0ambmrvdGjJ3RbK20crGqwFv8PzR6Go114JWlAS2aSb+1/wewqRruCVxB+hRcog5 + 95xBIKTLREP+w== +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 17:03:09 -0000 + +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)). + +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) + -- 2.26.2