[PATCH] test: simplify T360-symbol-hiding, use nm instead of objdump

diff --git a/c2/254e6a0050f3523ea50d5928c6a76a3854297b b/c2/254e6a0050f3523ea50d5928c6a76a3854297b
new file mode 100644 (file)
index 0000000..bb3c180
--- /dev/null
+++ b/c2/254e6a0050f3523ea50d5928c6a76a3854297b
@@ -0,0 +1,78 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 6F9A2431FBD\r
+       for <notmuch@notmuchmail.org>; Tue,  9 Sep 2014 23:41:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 hpZ3OmHeHHNO for <notmuch@notmuchmail.org>;\r
+       Tue,  9 Sep 2014 23:41:41 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F0A0B431FBC\r
+       for <notmuch@notmuchmail.org>; Tue,  9 Sep 2014 23:41:40 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1XRbax-0003z6-5C; Wed, 10 Sep 2014 03:41:35 -0300\r
+Received: (nullmailer pid 1453 invoked by uid 1000); Wed, 10 Sep 2014\r
+       06:41:29 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: simplify T360-symbol-hiding, use nm instead of objdump\r
+Date: Wed, 10 Sep 2014 08:41:11 +0200\r
+Message-Id: <1410331271-1403-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.0\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, 10 Sep 2014 06:41:46 -0000\r
+\r
+After yet another variation in objdump output caused this test to fail\r
+(on a Debian port, no less), I decided whatever putative benefit we\r
+get from looking at the object files instead of the library isn't\r
+worth the maintenence headache.\r
+\r
+This version uses nm -P. nm -P should be portable, and fixed format.\r
+It purposely doesn't use the -D argument, since that is non-POSIX and\r
+nm on GNU/Linux seems do the right thing without it.\r
+\r
+It still won't work out of the box on e.g. Mac OS/X. I think the right\r
+thing to do there is to move some more configuration information into\r
+sh.config.\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 636ec91..8fc4bdf 100755\r
+--- a/test/T360-symbol-hiding.sh\r
++++ b/test/T360-symbol-hiding.sh\r
+@@ -26,7 +26,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 -P $TEST_DIRECTORY/../lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | 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
+2.1.0\r
+\r