fa/a0dc537a5eae9385fadf78c5637a80f5b4998e

   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 0FA01429E42\r
   6         for <notmuch@notmuchmail.org>; Tue,  6 May 2014 10:03:12 -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: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\r
  13         autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id jEkQobUHNWlr for <notmuch@notmuchmail.org>;\r
  17         Tue,  6 May 2014 10:03:06 -0700 (PDT)\r
  18 Received: from qmta04.westchester.pa.mail.comcast.net\r
  19         (qmta04.westchester.pa.mail.comcast.net [76.96.62.40])\r
  20         by olra.theworths.org (Postfix) with ESMTP id BFCC1431E82\r
  21         for <notmuch@notmuchmail.org>; Tue,  6 May 2014 10:02:57 -0700 (PDT)\r
  22 Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74])\r
  23         by qmta04.westchester.pa.mail.comcast.net with comcast\r
  24         id ygU91n0021c6gX854h2xld; Tue, 06 May 2014 17:02:57 +0000\r
  25 Received: from jane.lan ([24.11.133.78])\r
  26         by omta23.westchester.pa.mail.comcast.net with comcast\r
  27         id yh2W1n00e1heoKc3jh2x3f; Tue, 06 May 2014 17:02:57 +0000\r
  28 From: Charles Celerier <cceleri@cs.stanford.edu>\r
  29 To: notmuch@notmuchmail.org\r
  30 Subject: [PATCH 5/5] T360-symbol-hiding: Use nm instead of objdump.\r
  31 Date: Tue,  6 May 2014 13:02:28 -0400\r
  32 Message-Id: <1399395748-44920-6-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-5-git-send-email-cceleri@cs.stanford.edu>\r
  35 References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
  36         <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu>\r
  37         <1399395748-44920-3-git-send-email-cceleri@cs.stanford.edu>\r
  38         <1399395748-44920-4-git-send-email-cceleri@cs.stanford.edu>\r
  39         <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu>\r
  40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  41         s=q20140121; t=1399395777;\r
  42         bh=yJbNsjwWzC7vT2qJT/cWkN+KTrDnMHjiGpqyysP9yJE=;\r
  43         h=Received:Received:From:To:Subject:Date:Message-Id;\r
  44         b=kc4IkTap5BQCBgYTzE3eZAC0Fwg7QOQrl7l2dDv4ayEHPWobPOk3UWky05Xq9BK1R\r
  45         25fdrMfB8/xC3dn4N9mWYl3lpJg/Z21n4E/0CfIrlrIBHsi88pGAiveIm6pLsGufcj\r
  46         T1SOTgRv8Q9QEQzuUXXEtSYGheA80Dkr0N5uIDzWtBAG85amAi0lJ4vyGXCO1oLbdr\r
  47         HJ6F6nv31w8LYMFJFXM1CSUqTQ7/n68yml7wkb41FttCVPLmFP9O6jhvIOEdrs4oNI\r
  48         +3Fn4vRePIOiNsiuwXl8SR/Io0EqopeLUIZwWSARQyEHe/HUpQipSlfqkTAjnC3HSF\r
  49         14B0SWdr/e8sw==\r
  50 X-BeenThere: notmuch@notmuchmail.org\r
  51 X-Mailman-Version: 2.1.13\r
  52 Precedence: list\r
  53 List-Id: "Use and development of the notmuch mail system."\r
  54         <notmuch.notmuchmail.org>\r
  55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  58 List-Post: <mailto:notmuch@notmuchmail.org>\r
  59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  62 X-List-Received-Date: Tue, 06 May 2014 17:03:12 -0000\r
  63 \r
  64 The output of `objdump -t` depends on the format of the object files\r
  65 which are different across platforms (e.g. Mac OS X). Since we really\r
  66 just want to filter the symbols in the object file, nm is a more\r
  67 appropriate tool since it only lists symbols from object files (nm(1))\r
  68 and has a consistent output format.\r
  69 \r
  70 Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>\r
  71 ---\r
  72  test/T360-symbol-hiding.sh | 3 ++-\r
  73  1 file changed, 2 insertions(+), 1 deletion(-)\r
  74 \r
  75 diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh\r
  76 index 97c734a..c5bbf27 100755\r
  77 --- a/test/T360-symbol-hiding.sh\r
  78 +++ b/test/T360-symbol-hiding.sh\r
  79 @@ -33,7 +33,8 @@ test_begin_subtest 'checking output'\r
  80  test_expect_equal "$result" "$output"\r
  81  \r
  82  test_begin_subtest 'comparing existing to exported symbols'\r
  83 -objdump -t $TEST_DIRECTORY/../lib/*.o | awk '$4 == ".text" && $6 ~ "^notmuch" {print $6}' | sort | uniq > ACTUAL\r
  84 +\r
  85 +nm -g $TEST_DIRECTORY/../lib/*.o | sed -n 's/.*\s\+T\s\+_\(notmuch_.*\)/\1/p' | sort | uniq > ACTUAL\r
  86  sed -n 's/[[:blank:]]*\(notmuch_[^;]*\);/\1/p' $TEST_DIRECTORY/../notmuch.sym | sort | uniq > EXPORTED\r
  87  test_expect_equal_file EXPORTED ACTUAL\r
  88  \r
  89 -- \r
  90 1.8.5.2 (Apple Git-48)\r
  91 \r