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

diff --git a/ae/20910a455938dcb9b774ea3ae5f327e3d3330b b/ae/20910a455938dcb9b774ea3ae5f327e3d3330b
new file mode 100644 (file)
index 0000000..62e15c5
--- /dev/null
+++ b/ae/20910a455938dcb9b774ea3ae5f327e3d3330b
@@ -0,0 +1,94 @@
+Return-Path: <tomi.ollila@iki.fi>\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 149C0431FBD\r
+       for <notmuch@notmuchmail.org>; Wed, 10 Sep 2014 03:04:22 -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 TKYDjAmPxaKE for <notmuch@notmuchmail.org>;\r
+       Wed, 10 Sep 2014 03:04:14 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8D97D431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 10 Sep 2014 03:04:14 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 2D77610008C;\r
+       Wed, 10 Sep 2014 13:04:01 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: simplify T360-symbol-hiding,\r
+       use nm instead of objdump\r
+In-Reply-To: <1410331271-1403-1-git-send-email-david@tethera.net>\r
+References: <1410331271-1403-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.18.1+93~gaa65b5d (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 10 Sep 2014 13:04:00 +0300\r
+Message-ID: <m2r3zjpzan.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 10:04:22 -0000\r
+\r
+On Wed, Sep 10 2014, David Bremner <david@tethera.net> wrote:\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
+LGTM.\r
+\r
+Tomi\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r