From patchwork Tue Feb 25 07:24:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 38298 Received: (qmail 67255 invoked by alias); 25 Feb 2020 07:24:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 67133 invoked by uid 89); 25 Feb 2020 07:24:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL, BAYES_40, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=6ec, UD:Foo, maintfoo, gccgo8 X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Feb 2020 07:24:14 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 49960AAC7; Tue, 25 Feb 2020 07:24:03 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Fix gdb.go/methods.exp From: Tom de Vries To: Tom Tromey Cc: gdb-patches@sourceware.org References: <20200221110152.GA30305@delia> <877e0ggfe8.fsf@tromey.com> <2d3be3b3-fc78-1fbf-7952-64d3962c14bc@suse.de> <877e0f7poe.fsf@tromey.com> <6639484a-4c7d-83e9-1d7b-66a3ed2066e6@suse.de> Message-ID: Date: Tue, 25 Feb 2020 08:24:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <6639484a-4c7d-83e9-1d7b-66a3ed2066e6@suse.de> X-IsSubscribed: yes [Fix ENOPATCH] On 25-02-2020 08:23, Tom de Vries wrote: > On 21-02-2020 19:36, Tom Tromey wrote: >>>>>>> "Tom" == Tom de Vries writes: >> >> Tom> I managed using maintenance print symbols. >> >> Tom> OK for trunk like this? >> >> Yes, thank you. >> > > The gcc PR for which I added the xfail was closed, so this updates the > gdb test-case. > > Committed as obvious. > [gdb/testsuite] Remove gcc/93866 xfail in methods.exp The test-case gdb.go/methods.exp contains an xfail for PR gcc/93866. However, that PR has been marked resolved-wontfix, with clarification that the gccgo symbol names for methods are correct, even if they're not the same as for gc. Remove the xfail. Tested on x86_64-linux with gccgo-10. gdb/testsuite/ChangeLog: 2020-02-25 Tom de Vries PR go/18926 * gdb.go/methods.exp: Remove gcc/93866 xfail. --- gdb/testsuite/gdb.go/methods.exp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp index b24ee14cf2..068212044c 100644 --- a/gdb/testsuite/gdb.go/methods.exp +++ b/gdb/testsuite/gdb.go/methods.exp @@ -29,8 +29,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug go}] } set bp_location1 {main.T.Foo} -set bp_location2 {main.(*T).Bar} -set bp_location2_regexp {main.\(\*T\).Bar} +set bp_location2 {main.T.Bar} if { [go_runto_main] < 0 } { untested "could not run to main" @@ -49,7 +48,6 @@ gdb_test_multiple "maintenance print symbols" "" { exp_continue } -re "^\r\n void main.T.Bar\[^\r\n\]*(?=\r\n)" { - set found_wrong_bar 2 exp_continue } -re "\r\n$gdb_prompt $" { @@ -86,20 +84,21 @@ if { $found_wrong_bar == 1 } { # <1><528>: Abbrev Number: 19 (DW_TAG_subprogram) # <529> DW_AT_name : main.Bar.pN6_main.T setup_xfail "*-*-*" -} elseif { $found_wrong_bar == 2 } { +} else { # We have with gccgo-8/9/10: # <1><6e4>: Abbrev Number: 24 (DW_TAG_subprogram) # <6e5> DW_AT_name : main.Bar..1main.T # <6ec> DW_AT_linkage_name: main.T.Bar - # xfail for GCC PR93866 - setup_xfail "*-*-*" -} else { + # For reference: with go1.11.13: # <1><6c49a>: Abbrev Number: 2 (DW_TAG_subprogram) # <6c49b> DW_AT_name : main.(*T).Bar - } + + # It has been clarified in PR gcc/93866 that it's ok that symbols names + # diverge between gc and gccgo. So, we accept the main.T.Bar as valid. +} if { [gdb_breakpoint ${bp_location2} message] } { - gdb_test "cont" "Breakpoint .*, ${bp_location2_regexp}.*" \ + gdb_test "cont" "Breakpoint .*, ${bp_location2}.*" \ "going to second breakpoint" }