From: David Bremner Date: Wed, 10 Sep 2014 06:41:11 +0000 (+0200) Subject: [PATCH] test: simplify T360-symbol-hiding, use nm instead of objdump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c98159d9ca2f4c882353c8ecae6ffe3a983fd437;p=notmuch-archives.git [PATCH] test: simplify T360-symbol-hiding, use nm instead of objdump --- diff --git a/c2/254e6a0050f3523ea50d5928c6a76a3854297b b/c2/254e6a0050f3523ea50d5928c6a76a3854297b new file mode 100644 index 000000000..bb3c1804a --- /dev/null +++ b/c2/254e6a0050f3523ea50d5928c6a76a3854297b @@ -0,0 +1,78 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 6F9A2431FBD + for ; Tue, 9 Sep 2014 23:41:46 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id hpZ3OmHeHHNO for ; + Tue, 9 Sep 2014 23:41:41 -0700 (PDT) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id F0A0B431FBC + for ; Tue, 9 Sep 2014 23:41:40 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1XRbax-0003z6-5C; Wed, 10 Sep 2014 03:41:35 -0300 +Received: (nullmailer pid 1453 invoked by uid 1000); Wed, 10 Sep 2014 + 06:41:29 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH] test: simplify T360-symbol-hiding, use nm instead of objdump +Date: Wed, 10 Sep 2014 08:41:11 +0200 +Message-Id: <1410331271-1403-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.0 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 10 Sep 2014 06:41:46 -0000 + +After yet another variation in objdump output caused this test to fail +(on a Debian port, no less), I decided whatever putative benefit we +get from looking at the object files instead of the library isn't +worth the maintenence headache. + +This version uses nm -P. nm -P should be portable, and fixed format. +It purposely doesn't use the -D argument, since that is non-POSIX and +nm on GNU/Linux seems do the right thing without it. + +It still won't work out of the box on e.g. Mac OS/X. I think the right +thing to do there is to move some more configuration information into +sh.config. +--- + test/T360-symbol-hiding.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh +index 636ec91..8fc4bdf 100755 +--- a/test/T360-symbol-hiding.sh ++++ b/test/T360-symbol-hiding.sh +@@ -26,7 +26,7 @@ test_begin_subtest 'checking output' + test_expect_equal "$result" "$output" + + test_begin_subtest 'comparing existing to exported symbols' +-objdump -t $TEST_DIRECTORY/../lib/*.o | awk '$4 == ".text" && $6 ~ "^notmuch" {print $6}' | sort | uniq > ACTUAL ++nm -P $TEST_DIRECTORY/../lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL + sed -n 's/[[:blank:]]*\(notmuch_[^;]*\);/\1/p' $TEST_DIRECTORY/../notmuch.sym | sort | uniq > EXPORTED + test_expect_equal_file EXPORTED ACTUAL + +-- +2.1.0 +