From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103985 invoked by alias); 17 Mar 2019 15:13:55 -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 103975 invoked by uid 89); 17 Mar 2019 15:13:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 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=UD:info X-Spam-Status: No, score=-25.2 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 Subject: Mention used workaround in dwz.log From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com References: <20190317100921.GA30087@delia> Message-ID: <0e6f7a5f-e6ea-28ba-0adb-a3f7ba25ec1f@suse.de> Date: Tue, 01 Jan 2019 00:00:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20190317100921.GA30087@delia> Content-Type: multipart/mixed; boundary="------------F936720B79312B518CA2DB39" Content-Language: en-US X-SW-Source: 2019-q1/txt/msg00148.txt.bz2 This is a multi-part message in MIME format. --------------F936720B79312B518CA2DB39 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 355 [was: Re: [committed] Add test-cases twice.sh and twice-multifile.sh ] On 17-03-19 11:09, Tom de Vries wrote: > +if [ $status -eq 1 ]; then > + # PR24354 > + true > +else > + [ $status -eq 0 ] > +fi It occurred to me that rather than silently working around PRs, it could be better to do it more verbose. Committed as attached. Thanks, - Tom --------------F936720B79312B518CA2DB39 Content-Type: text/x-patch; name="0001-Mention-used-workaround-in-dwz.log.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-Mention-used-workaround-in-dwz.log.patch" Content-length: 1536 Mention used workaround in dwz.log Add a mechanism where tests can add text to a file dwz.info, which is then included in the dwz.log file. Use the mechanism to mention the workaround used in twice-multifile.sh. 2019-03-17 Tom de Vries * testsuite/dwz.tests/twice-multifile.sh: Mention workaround in dwz.info. * testsuite/dwz.tests/dwz-tests.exp: Include dwz.info in dwz.log. --- testsuite/dwz.tests/dwz-tests.exp | 6 ++++++ testsuite/dwz.tests/twice-multifile.sh | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testsuite/dwz.tests/dwz-tests.exp b/testsuite/dwz.tests/dwz-tests.exp index 983d323..5a0b551 100644 --- a/testsuite/dwz.tests/dwz-tests.exp +++ b/testsuite/dwz.tests/dwz-tests.exp @@ -42,6 +42,12 @@ foreach test $tests { puts "$msg" fail "$test" } else { + if { [file exists dwz.info ] } { + set info [exec cat dwz.info] + verbose -log "$test:" 1 + verbose -log "$info" 1 + exec rm -f dwz.info + } set file_list [glob -nocomplain "$dir/*"] if {[llength $file_list] != 0} { puts "$dir is not empty" diff --git a/testsuite/dwz.tests/twice-multifile.sh b/testsuite/dwz.tests/twice-multifile.sh index fded77a..a0d023a 100644 --- a/testsuite/dwz.tests/twice-multifile.sh +++ b/testsuite/dwz.tests/twice-multifile.sh @@ -25,8 +25,7 @@ if [ $(grep -qv "DWARF compression not beneficial" dwz.err \ fi if [ $status -eq 1 ]; then - # PR24354 - true + echo "PR24354 workaround used" > dwz.info else [ $status -eq 0 ] fi --------------F936720B79312B518CA2DB39--