From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id CC019385800D for ; Sat, 20 Mar 2021 08:38:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CC019385800D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E8CCEAC82; Sat, 20 Mar 2021 08:38:15 +0000 (UTC) Date: Sat, 20 Mar 2021 09:38:13 +0100 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com, mark@klomp.org Subject: [committed][testsuite] Handle readelf following links by default Message-ID: <20210320083812.GA7983@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 08:38:18 -0000 Hi, Since binutils commit c46b706620e "Change the readelf and objdump programs so that they will automatically follow links to separate debug info files" there are a few FAILs in the dwz testsuite. This is just due to changing the default behaviour for readelf. Fix this by testing whether the new -Wn readelf flag is supported, and if so, adding it to the readelf call. Committed to trunk. Thanks, - Tom [testsuite] Handle readelf following links by default 2021-03-20 Tom de Vries PR dwz/27592 * testsuite/dwz.tests/odr-struct-multifile.sh: Call readelf with -wN if supported. * testsuite/dwz.tests/cycle.sh: Same. --- testsuite/dwz.tests/cycle.sh | 7 ++++++- testsuite/dwz.tests/odr-struct-multifile.sh | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/testsuite/dwz.tests/cycle.sh b/testsuite/dwz.tests/cycle.sh index 5c181dd..85aa556 100644 --- a/testsuite/dwz.tests/cycle.sh +++ b/testsuite/dwz.tests/cycle.sh @@ -1,3 +1,8 @@ +readelf_flags="" +if readelf -h 2>&1 | grep -q "\-wN,"; then + readelf_flags=-wN +fi + cp $execs/cycle 1 # Using mode 3 in checksum_die_ref. @@ -21,7 +26,7 @@ $execs/dwz-for-test -m 3 1 2 --devel-no-checksum-cycle-opt --devel-ignore-size cnt=$(readelf -wi 3 | grep -c "DW_AT_name.*: s$") [ $cnt -eq 1 ] -cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*: s$" || true) +cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*: s$" || true) [ $cnt -eq 0 ] rm -f 1 2 3 diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh index cc462c9..20b682b 100644 --- a/testsuite/dwz.tests/odr-struct-multifile.sh +++ b/testsuite/dwz.tests/odr-struct-multifile.sh @@ -2,6 +2,11 @@ if ! $execs/dwz-for-test --odr -v 2>/dev/null; then exit 77 fi +readelf_flags="" +if readelf -h 2>&1 | grep -q "\-wN,"; then + readelf_flags=-wN +fi + cp $execs/odr-struct 1 cp 1 2 @@ -41,12 +46,12 @@ done for name in aaa bbb ccc; do - cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true) + cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true) [ $cnt -eq 0 ] done for name in member_one member_two member_three member_four; do - cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true) + cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true) [ $cnt -eq 0 ] done