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 2E2F33857020 for ; Fri, 5 Mar 2021 09:41:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2E2F33857020 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 49D68AD2B; Fri, 5 Mar 2021 09:41:28 +0000 (UTC) Date: Fri, 5 Mar 2021 10:41:26 +0100 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com, mark@klomp.org Subject: [committed][testsuite] Fix odr-loc.sh with -gdwarf-5 Message-ID: <20210305094125.GA2660@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.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, 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: Fri, 05 Mar 2021 09:41:30 -0000 Hi, When running the test-suite like this: ... $ make clean; make; make check CC="gcc -gdwarf-5" CXX="g++ -gdwarf-5" ... we run into: ... FAIL: src/testsuite/dwz.tests/odr-loc.sh ... The test-case calls dwz twice, once without and once with --devel-ignore-locus. The first call is there to verify that all DIEs that can be deduplicated without --devel-ignore-locus are indeed deduplicated, but not more. The FAIL happens because some DIEs are not deduplicated. This is a regression since commit 61c8d81 "Fix DW_AT_decl_file for odr". This makes sense: the commit changed partitioning, and now the size heuristics are preventing some deduplication. Fix this by ignoring the size heuristics in the first dwz call using --devel-ignore-size. Committed to trunk. Thanks, - Tom [testsuite] Fix odr-loc.sh with -gdwarf-5 2021-03-05 Tom de Vries * testsuite/dwz.tests/odr-loc.sh: Call dwz first time using --devel-ignore-size. --- testsuite/dwz.tests/odr-loc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/dwz.tests/odr-loc.sh b/testsuite/dwz.tests/odr-loc.sh index 4dc8fb3..a8b3318 100644 --- a/testsuite/dwz.tests/odr-loc.sh +++ b/testsuite/dwz.tests/odr-loc.sh @@ -9,7 +9,7 @@ for name in aaa bbb ccc; do [ $cnt -eq 2 ] done -$execs/dwz-for-test --odr 1 +$execs/dwz-for-test --odr 1 --devel-ignore-size verify-dwarf.sh 1