From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 52010 invoked by alias); 11 Jul 2019 08:33:19 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 52001 invoked by uid 89); 11 Jul 2019 08:33:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy= X-Spam-Status: No, score=-26.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com Subject: [committed] Require eu-unstrip >= 0.168 for objcopy-eu-unstrip*.sh Message-ID: <20190711083312.GA902@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-SW-Source: 2019-q3/txt/msg00069.txt.bz2 Hi, When using eu-unstrip 0.158, we run into: ... eu-unstrip: cannot find matching section for [1] '.interp' eu-unstrip: cannot find matching section for [2] '.note.ABI-tag' ... eu-unstrip: cannot find matching section for [26] '.data' eu-unstrip: cannot find matching section for [27] '.bss' FAIL: testsuite/dwz.tests/objcopy-eu-unstrip.sh ... And at eu-unstrip 0.164, this turns into: ... eu-unstrip: invalid string offset in symbol [70] FAIL: testsuite/dwz.tests/objcopy-eu-unstrip.sh ... The test starts passing at eu-unstrip 0.168. Fix the FAIL by requiring at least eu-unstrip 0.168 for objcopy-eu-unstrip*.sh. Committed to trunk. Thanks, - Tom Require eu-unstrip >= 0.168 for objcopy-eu-unstrip*.sh 2019-07-11 Tom de Vries * testsuite/dwz.tests/objcopy-eu-unstrip-multifile.sh: Require eu-unstrip >= 0.168. * testsuite/dwz.tests/objcopy-eu-unstrip.sh: Same. --- testsuite/dwz.tests/objcopy-eu-unstrip-multifile.sh | 9 +++++++++ testsuite/dwz.tests/objcopy-eu-unstrip.sh | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/testsuite/dwz.tests/objcopy-eu-unstrip-multifile.sh b/testsuite/dwz.tests/objcopy-eu-unstrip-multifile.sh index bc8c0b8..5f63c6d 100644 --- a/testsuite/dwz.tests/objcopy-eu-unstrip-multifile.sh +++ b/testsuite/dwz.tests/objcopy-eu-unstrip-multifile.sh @@ -17,6 +17,15 @@ fi [ $status -eq 0 ] +version=$(eu-unstrip --version | head -n 1 | cut -d ' ' -f3) +major=$(echo $version | sed 's%\..*%%') +minor=$(echo $version | sed 's%.*\.%%') +if [ $major -gt 0 ] || [ $minor -ge 168 ]; then + true +else + exit 77 +fi + eu-unstrip 1.stripped 1.debug -o 1.unstripped smaller-than.sh 1.unstripped 1 diff --git a/testsuite/dwz.tests/objcopy-eu-unstrip.sh b/testsuite/dwz.tests/objcopy-eu-unstrip.sh index dc068d9..460da93 100644 --- a/testsuite/dwz.tests/objcopy-eu-unstrip.sh +++ b/testsuite/dwz.tests/objcopy-eu-unstrip.sh @@ -13,6 +13,15 @@ fi [ $status -eq 0 ] +version=$(eu-unstrip --version | head -n 1 | cut -d ' ' -f3) +major=$(echo $version | sed 's%\..*%%') +minor=$(echo $version | sed 's%.*\.%%') +if [ $major -gt 0 ] || [ $minor -ge 168 ]; then + true +else + exit 77 +fi + eu-unstrip 1.stripped 1.debug -o 1.unstripped smaller-than.sh 1.unstripped 1