[PATCH v2 5/5] T360-symbol-hiding: Use nm instead of objdump.

diff --git a/4b/9b3925687eaecc4f008e57f2d28cfc6040a69b b/4b/9b3925687eaecc4f008e57f2d28cfc6040a69b
new file mode 100644 (file)
index 0000000..f7f1b4b
--- /dev/null
+++ b/4b/9b3925687eaecc4f008e57f2d28cfc6040a69b
@@ -0,0 +1,77 @@
+Return-Path: <cceleri@cs.stanford.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5B349431FBD\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 20:50:35 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 9WilArlDxeX3 for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 20:50:28 -0700 (PDT)\r
+Received: from smtp3.cs.Stanford.EDU (smtp3.cs.Stanford.EDU [171.64.64.27])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7C7C8431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 20:50:28 -0700 (PDT)\r
+Received: from c-24-11-133-78.hsd1.sc.comcast.net ([24.11.133.78]\r
+       helo=jane.lan)\r
+       by smtp3.cs.Stanford.EDU with esmtpsa (TLSv1:DHE-RSA-SEED-SHA:128)\r
+       (Exim 4.80.1) (envelope-from <cceleri@cs.stanford.edu>)\r
+       id 1WhssA-0000I5-Qj; Tue, 06 May 2014 20:50:23 -0700\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 5/5] T360-symbol-hiding: Use nm instead of objdump.\r
+Date: Tue,  6 May 2014 23:50:15 -0400\r
+Message-Id: <1399434615-28425-2-git-send-email-cceleri@cs.stanford.edu>\r
+X-Mailer: git-send-email 1.8.5.2 (Apple Git-48)\r
+In-Reply-To: <1399434615-28425-1-git-send-email-cceleri@cs.stanford.edu>\r
+References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu>\r
+       <1399434615-28425-1-git-send-email-cceleri@cs.stanford.edu>\r
+X-Scan-Signature: 5e15904e367bf57319d290d73554c551\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 07 May 2014 03:50:35 -0000\r
+\r
+The output of `objdump -t` depends on the format of the object files\r
+which are different across platforms (e.g. Mac OS X). Since we really\r
+just want to filter the symbols in the object file, nm is a more\r
+appropriate tool since it only lists symbols from object files (nm(1))\r
+and has a consistent output format.\r
+\r
+Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>\r
+---\r
+ test/T360-symbol-hiding.sh | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh\r
+index 9239fc1..21cabca 100755\r
+--- a/test/T360-symbol-hiding.sh\r
++++ b/test/T360-symbol-hiding.sh\r
+@@ -33,7 +33,7 @@ test_begin_subtest 'checking output'\r
+ test_expect_equal "$result" "$output"\r
+ \r
+ test_begin_subtest 'comparing existing to exported symbols'\r
+-objdump -t $TEST_DIRECTORY/../lib/*.o | awk '$4 == ".text" && $6 ~ "^notmuch" {print $6}' | sort | uniq > ACTUAL\r
++nm -g $TEST_DIRECTORY/../lib/*.o | sed -n 's/.*\s\+T\s\+_\(notmuch_.*\)/\1/p' | sort | uniq > ACTUAL\r
+ sed -n 's/[[:blank:]]*\(notmuch_[^;]*\);/\1/p' $TEST_DIRECTORY/../notmuch.sym | sort | uniq > EXPORTED\r
+ test_expect_equal_file EXPORTED ACTUAL\r
+ \r
+-- \r
+1.8.5.2 (Apple Git-48)\r
+\r