From: Charles Celerier Date: Tue, 6 May 2014 17:02:28 +0000 (+2000) Subject: [PATCH 5/5] T360-symbol-hiding: Use nm instead of objdump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5dfacb103da6603689340f3d0b111f899ff749cf;p=notmuch-archives.git [PATCH 5/5] T360-symbol-hiding: Use nm instead of objdump. --- diff --git a/fa/a0dc537a5eae9385fadf78c5637a80f5b4998e b/fa/a0dc537a5eae9385fadf78c5637a80f5b4998e new file mode 100644 index 000000000..41294b361 --- /dev/null +++ b/fa/a0dc537a5eae9385fadf78c5637a80f5b4998e @@ -0,0 +1,91 @@ +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 0FA01429E42 + for ; Tue, 6 May 2014 10:03:12 -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=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] + 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 jEkQobUHNWlr for ; + Tue, 6 May 2014 10:03:06 -0700 (PDT) +Received: from qmta04.westchester.pa.mail.comcast.net + (qmta04.westchester.pa.mail.comcast.net [76.96.62.40]) + by olra.theworths.org (Postfix) with ESMTP id BFCC1431E82 + for ; Tue, 6 May 2014 10:02:57 -0700 (PDT) +Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74]) + by qmta04.westchester.pa.mail.comcast.net with comcast + id ygU91n0021c6gX854h2xld; Tue, 06 May 2014 17:02:57 +0000 +Received: from jane.lan ([24.11.133.78]) + by omta23.westchester.pa.mail.comcast.net with comcast + id yh2W1n00e1heoKc3jh2x3f; Tue, 06 May 2014 17:02:57 +0000 +From: Charles Celerier +To: notmuch@notmuchmail.org +Subject: [PATCH 5/5] T360-symbol-hiding: Use nm instead of objdump. +Date: Tue, 6 May 2014 13:02:28 -0400 +Message-Id: <1399395748-44920-6-git-send-email-cceleri@cs.stanford.edu> +X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) +In-Reply-To: <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu> +References: <1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-2-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-3-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-4-git-send-email-cceleri@cs.stanford.edu> + <1399395748-44920-5-git-send-email-cceleri@cs.stanford.edu> +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1399395777; + bh=yJbNsjwWzC7vT2qJT/cWkN+KTrDnMHjiGpqyysP9yJE=; + h=Received:Received:From:To:Subject:Date:Message-Id; + b=kc4IkTap5BQCBgYTzE3eZAC0Fwg7QOQrl7l2dDv4ayEHPWobPOk3UWky05Xq9BK1R + 25fdrMfB8/xC3dn4N9mWYl3lpJg/Z21n4E/0CfIrlrIBHsi88pGAiveIm6pLsGufcj + T1SOTgRv8Q9QEQzuUXXEtSYGheA80Dkr0N5uIDzWtBAG85amAi0lJ4vyGXCO1oLbdr + HJ6F6nv31w8LYMFJFXM1CSUqTQ7/n68yml7wkb41FttCVPLmFP9O6jhvIOEdrs4oNI + +3Fn4vRePIOiNsiuwXl8SR/Io0EqopeLUIZwWSARQyEHe/HUpQipSlfqkTAjnC3HSF + 14B0SWdr/e8sw== +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: Tue, 06 May 2014 17:03:12 -0000 + +The output of `objdump -t` depends on the format of the object files +which are different across platforms (e.g. Mac OS X). Since we really +just want to filter the symbols in the object file, nm is a more +appropriate tool since it only lists symbols from object files (nm(1)) +and has a consistent output format. + +Signed-off-by: Charles Celerier +--- + test/T360-symbol-hiding.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh +index 97c734a..c5bbf27 100755 +--- a/test/T360-symbol-hiding.sh ++++ b/test/T360-symbol-hiding.sh +@@ -33,7 +33,8 @@ 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 -g $TEST_DIRECTORY/../lib/*.o | sed -n 's/.*\s\+T\s\+_\(notmuch_.*\)/\1/p' | sort | uniq > ACTUAL + sed -n 's/[[:blank:]]*\(notmuch_[^;]*\);/\1/p' $TEST_DIRECTORY/../notmuch.sym | sort | uniq > EXPORTED + test_expect_equal_file EXPORTED ACTUAL + +-- +1.8.5.2 (Apple Git-48) +