From patchwork Thu Sep 5 22:12:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Blaikie X-Patchwork-Id: 34403 Received: (qmail 26934 invoked by alias); 5 Sep 2019 22:12:28 -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 26926 invoked by uid 89); 5 Sep 2019 22:12:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-12.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-yw1-f67.google.com Received: from mail-yw1-f67.google.com (HELO mail-yw1-f67.google.com) (209.85.161.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 05 Sep 2019 22:12:26 +0000 Received: by mail-yw1-f67.google.com with SMTP id u141so1456359ywe.4 for ; Thu, 05 Sep 2019 15:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xjo83JLbiMpaWa03DSOoLFS2eMIXgn5sor1cIlr58Wg=; b=gJ3bNoW52b5UQhNUosm7lyveobDBqu3GXg5OMmDHY1GwLq8RJGY37yRNd8sIxlLOHC Ul+HHGgZjtNOo5303ZaYIGscnIG6jwGK+dZ5vWSPBS0rxx+Iq/CBdq2jY+aAnBr46+wY kx8ox09dviZayoBI6aNj0iRfPPcWwcu3MO3zAZS9ir9q1SdmogChivhaceloLrBBznCO El6lI7oX2bKnTqM0DkrUU7eJtPWMlz0x29TX3eOIhrOY3I5wcbAmJBopnDA4vtduuLiV vHrL23XuSelIAi9fUsDDCdm/9AtALYxsYZZf003DrLCfAHH8LxO8I+te+GKNksPEexHf e5YQ== MIME-Version: 1.0 References: <21336.14486.650610.274638@ruffy.mtv.corp.google.com> In-Reply-To: From: David Blaikie Date: Thu, 5 Sep 2019 15:12:13 -0700 Message-ID: Subject: Re: [patch] [gdb/testsuite] XFAIL under Clang tests using label debug info To: Doug Evans , Pedro Alves Cc: gdb-patches X-IsSubscribed: yes Clang now supports labels - so I'd like to essentially revert this patch. Is this OK? On Thu, Apr 24, 2014 at 8:23 PM David Blaikie wrote: > > On Wed, Apr 23, 2014 at 3:03 PM, Doug Evans wrote: > > David Blaikie writes: > > > Clang doesn't emit debug info for labels (Clang PR14500). XFAIL a > > > bunch of GDB tests that rely on debug info for labels. > > > > > > For some reason gdb.linespec/ls-expr.exp gathered all tests into a > > > dictionary and then ran them. This made it hard to XFAIL just the > > > right tests. I refactored this to execute the tests directly, removing > > > the dictionary so I could XFAIL the right tests. Is there a reason it > > > would've been written that way? Does my patch break it in some way? > > > commit c438cb16b63292e415330f289616c4e4ecece63c > > > Author: David Blaikie > > > Date: Sun Apr 13 11:42:02 2014 -0700 > > > > > > XFAIL under Clang tests using labels > > > > > > gdb/testsuite/ > > > * gdb.base/label.exp: XFAIL label related tests under Clang. > > > * gdb.cp/cplabel.exp: Ditto. > > > * gdb.linespec/ls-errs.exp: Refactor tests to execute directly > > > and XFAIL under Clang those using labels. > > > > LGTM > > > > > diff --git gdb/testsuite/ChangeLog gdb/testsuite/ChangeLog > > > index 730c116..b04b940 100644 > > > --- gdb/testsuite/ChangeLog > > > +++ gdb/testsuite/ChangeLog > > > @@ -1,3 +1,9 @@ > > > +2014-04-12 David Blaikie > > > + > > > + * gdb.base/label.exp: XFAIL label related tests under Clang. > > > + * gdb.cp/cplabel.exp: Ditto. > > > + * gdb.linespec/ls-errs.exp: Refactor tests to execute directly and XFAIL under Clang those using labels. > > > + > > > > Nit: space vs tabs. Just use tabs. > > Plus line is longer than 80 chars. > > Thanks for the catches - fixed those up and committed in > c2e827ad5340fcf1735df6c77cb0311e56b985ef. > > Also refactored some of the xfails along the lines of what Pedro > suggested in the one test case that had several similar failures > (gdb.base/label.exp). If/when we fix this in Clang it might be worth > refactoring into a common function (though I'm personally not very > vested in keeping the test suite usable with anything other than ToT > Clang - perhaps others are). commit 78c67ab1f234b91aa3016ee29966ba141fd5b5b1 Author: David Blaikie Date: Thu Sep 5 15:01:25 2019 -0700 un-XFAIL under Clang tests using labels gdb/testsuite/ * gdb.base/label.exp: un-XFAIL label related tests under Clang. * gdb.cp/cplabel.exp: Ditto. * gdb.linespec/ls-errs.exp: Ditto. diff --git gdb/testsuite/ChangeLog gdb/testsuite/ChangeLog index 46c7b5f927..1d1b706bb2 100644 --- gdb/testsuite/ChangeLog +++ gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-04-24 David Blaikie + + * gdb.base/label.exp: un-XFAIL label related tests under Clang. + * gdb.cp/cplabel.exp: Ditto. + * gdb.linespec/ls-errs.exp: Ditto. + 2019-09-04 Philippe Waroquiers * gdb.base/info-var.exp: Test info variables without running diff --git gdb/testsuite/gdb.base/label.exp gdb/testsuite/gdb.base/label.exp index bce90cb60e..ec4851970e 100644 --- gdb/testsuite/gdb.base/label.exp +++ gdb/testsuite/gdb.base/label.exp @@ -29,34 +29,24 @@ if {![runto_main]} { return -1 } -set has_pr_14500_fixed 1 -if {[test_compiler_info {clang-*-*}]} { - set has_pr_14500_fixed 0 -} - -if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "break here" \ "Breakpoint.*at.*" \ "breakpoint here" -if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "break main:there" \ "Breakpoint.*at.*" \ "breakpoint there" -if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "cont" \ "Breakpoint 3,.*" \ "continue to 'there'" -if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "cont" \ "Breakpoint 2,.*" \ "continue to 'here'" rerun_to_main -if {!$has_pr_14500_fixed} { setup_xfail clang/14500 *-*-* } gdb_test "cont" \ "Breakpoint 3,.*" \ "continue to 'there' after re-run" diff --git gdb/testsuite/gdb.cp/cplabel.exp gdb/testsuite/gdb.cp/cplabel.exp index 26818cb1a2..93febd6925 100644 --- gdb/testsuite/gdb.cp/cplabel.exp +++ gdb/testsuite/gdb.cp/cplabel.exp @@ -34,7 +34,6 @@ set labels {"to_the_top" "get_out_of_here"} foreach m $methods { foreach l $labels { set line [gdb_get_line_number "$m:$l"] - if {[test_compiler_info {clang-*-*}]} { setup_xfail clang/14500 *-*-* } gdb_test "break foo::$m:$l" \ "Breakpoint $decimal at $hex: file .*$srcfile, line $line\." } diff --git gdb/testsuite/gdb.linespec/ls-errs.exp gdb/testsuite/gdb.linespec/ls-errs.exp index 92a858ce26..f031c461cb 100644 --- gdb/testsuite/gdb.linespec/ls-errs.exp +++ gdb/testsuite/gdb.linespec/ls-errs.exp @@ -231,9 +231,6 @@ proc do_test {lang} { foreach x $spaces { test_break "main${x}there" invalid_label "there" "main" - if {[test_compiler_info {clang-*-*}]} { - setup_xfail clang/14500 *-*-* - } test_break "main:here${x}" unexpected "end of input" }