d9/860844b81db9818fbded7e0cc291c3742a8073

   1 Return-Path: <cceleri@cs.stanford.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id DBF01431FBD\r
   6         for <notmuch@notmuchmail.org>; Tue,  6 May 2014 20:50:33 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id lR5o1P9rvdQm for <notmuch@notmuchmail.org>;\r
  16         Tue,  6 May 2014 20:50:26 -0700 (PDT)\r
  17 Received: from smtp3.cs.Stanford.EDU (smtp3.cs.Stanford.EDU [171.64.64.27])\r
  18         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id 8B2DC431FAE\r
  21         for <notmuch@notmuchmail.org>; Tue,  6 May 2014 20:50:26 -0700 (PDT)\r
  22 Received: from c-24-11-133-78.hsd1.sc.comcast.net ([24.11.133.78]\r
  23         helo=jane.lan)\r
  24         by smtp3.cs.Stanford.EDU with esmtpsa (TLSv1:DHE-RSA-SEED-SHA:128)\r
  25         (Exim 4.80.1) (envelope-from <cceleri@cs.stanford.edu>)\r
  26         id 1Whss9-0000I5-K4; Tue, 06 May 2014 20:50:22 -0700\r
  27 From: Charles Celerier <cceleri@cs.stanford.edu>\r
  28 To: Notmuch Mail <notmuch@notmuchmail.org>\r
  29 Subject: [PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on\r
  30         Mac OS X.\r
  31 Date: Tue,  6 May 2014 23:50:14 -0400\r
  32 Message-Id: <1399434615-28425-1-git-send-email-cceleri@cs.stanford.edu>\r
  33 X-Mailer: git-send-email 1.8.5.2 (Apple Git-48)\r
  34 In-Reply-To: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
  35 References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
  36 X-Scan-Signature: 6b0537b5faa14548adc1759647fcb4de\r
  37 X-BeenThere: notmuch@notmuchmail.org\r
  38 X-Mailman-Version: 2.1.13\r
  39 Precedence: list\r
  40 List-Id: "Use and development of the notmuch mail system."\r
  41         <notmuch.notmuchmail.org>\r
  42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  43         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  45 List-Post: <mailto:notmuch@notmuchmail.org>\r
  46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  48         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  49 X-List-Received-Date: Wed, 07 May 2014 03:50:34 -0000\r
  50 \r
  51 The Mac OS X platform uses *.dylib object files instead of *.so object\r
  52 files for linking. Adding the path to notmuch.dylib to the end of\r
  53 DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to\r
  54 notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see\r
  55 dyld(1)).\r
  56 \r
  57 Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>\r
  58 ---\r
  59  test/T360-symbol-hiding.sh | 9 ++++++++-\r
  60  1 file changed, 8 insertions(+), 1 deletion(-)\r
  61 \r
  62 diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh\r
  63 index 636ec91..9239fc1 100755\r
  64 --- a/test/T360-symbol-hiding.sh\r
  65 +++ b/test/T360-symbol-hiding.sh\r
  66 @@ -12,7 +12,14 @@ test_description='exception symbol hiding'\r
  67  . ./test-lib.sh\r
  68  \r
  69  run_test(){\r
  70 -    result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
  71 +    case $(uname -s) in\r
  72 +    Darwin)\r
  73 +        result=$(DYLD_FALLBACK_LIBRARY_PATH="$TEST_DIRECTORY/../lib${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
  74 +        ;;\r
  75 +    *)\r
  76 +        result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $TEST_DIRECTORY/symbol-test 2>&1)\r
  77 +        ;;\r
  78 +    esac\r
  79  }\r
  80  \r
  81  output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'\r
  82 -- \r
  83 1.8.5.2 (Apple Git-48)\r
  84 \r