[RFC] testsuite: Workaround issues with GCC 4.8.0pre + gdb.trace new KFAIL

Message ID	20130202092240.GA24458@host2.jankratochvil.net
State	New
Headers	show Return-Path: <gcc-patches-return-336299-incoming=patchwork.ozlabs.org@gcc.gnu.org> Comment: DKIM? See http://www.dkim.org Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=soiDvHZkpP08fb00VgTcivQu+yqir0wSnw+SPr3goCnCzrDN2Q5fyY5+t4b/IY EUREUW8m6soeY5zcQ7G4aEs5GSZyyeBTFXoyXbIXP3fw0Q2Uvfs6GF+1bt8s3Csx m8RzsjxEZqxT3QR9OpubY7ip405fEvOnSDH2rW8NrzQQI=; Date: Sat, 2 Feb 2013 10:22:40 +0100 From: Jan Kratochvil <jan.kratochvil@redhat.com> To: gcc-patches@gcc.gnu.org Cc: Yao Qi <yao@codesourcery.com> Subject: Re: [RFC patch] testsuite: Workaround issues with GCC 4.8.0pre + gdb.trace new KFAIL Message-ID: <20130202092240.GA24458@host2.jankratochvil.net> References: <20130126202645.GA4888@host2.jankratochvil.net> <5106D7E1.1060705@codesourcery.com> <20130129174955.GA17823@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130129174955.GA17823@host2.jankratochvil.net> User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

diff --git a/gdb/testsuite/gdb.base/restore.c b/gdb/testsuite/gdb.base/restore.c index 526be5f..a9b6d28 100644 --- a/gdb/testsuite/gdb.base/restore.c +++ b/gdb/testsuite/gdb.base/restore.c @@ -206,6 +206,10 @@ caller2 (void) int caller3 (void) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register int l1 = increment (0x7eeb); /* caller3 prologue */ register int l2 = increment (l1); register int l3 = increment (l2); @@ -222,7 +226,15 @@ caller3 (void) int caller4 (void) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register int l1 = increment (0x7eeb); /* caller4 prologue */ + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register int l2 = increment (l1); register int l3 = increment (l2); register int l4 = increment (l3); @@ -239,8 +251,20 @@ caller4 (void) int caller5 (void) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register int l1 = increment (0x7eeb); /* caller5 prologue */ + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register int l2 = increment (l1); + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register int l3 = increment (l2); register int l4 = increment (l3); register int l5 = increment (l4); diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp index dbe01dc..a7fa91b 100644 --- a/gdb/testsuite/gdb.base/restore.exp +++ b/gdb/testsuite/gdb.base/restore.exp @@ -24,7 +24,37 @@ standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $executable $srcfile] } { +set opts {debug} + +if { [prepare_for_testing $testfile.exp $executable $srcfile $opts] } { + return -1 +} + +if {![runto_main]} { + return -1 +} + +foreach caller { caller3 caller4 caller5 } { with_test_prefix $caller { + gdb_breakpoint $caller + gdb_continue_to_breakpoint $caller + + foreach l { l1 l2 l3 } { with_test_prefix $l { + set test "info addr $l" + gdb_test_multiple $test $test { + -re "\r\nSymbol \"$l\" is optimized out\\.\r\n$gdb_prompt $" { + lappend opts additional_flags=-DGCC_PR_55056 + xfail "$test (register variable has no location)" + } + -re "\r\nSymbol \"$l\" is .*\r\n$gdb_prompt $" { + pass $test + } + } + }} +}} + +set executable ${testfile}opts + +if { [prepare_for_testing $testfile.exp $executable $srcfile $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.base/store.c b/gdb/testsuite/gdb.base/store.c index 545515d..3ac4a1a 100644 --- a/gdb/testsuite/gdb.base/store.c +++ b/gdb/testsuite/gdb.base/store.c @@ -98,6 +98,10 @@ wack_long (register long u, register long v) long wack_longest (register longest u, register longest v) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register longest l = u, r = v; l = add_longest (l, r); return l + r; @@ -106,6 +110,10 @@ wack_longest (register longest u, register longest v) float wack_float (register float u, register float v) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register float l = u, r = v; l = add_float (l, r); return l + r; @@ -114,6 +122,10 @@ wack_float (register float u, register float v) double wack_double (register double u, register double v) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register double l = u, r = v; l = add_double (l, r); return l + r; @@ -122,6 +134,10 @@ wack_double (register double u, register double v) doublest wack_doublest (register doublest u, register doublest v) { + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register doublest l = u, r = v; l = add_doublest (l, r); return l + r; diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp index 292a319..e977f5e 100644 --- a/gdb/testsuite/gdb.base/store.exp +++ b/gdb/testsuite/gdb.base/store.exp @@ -18,7 +18,37 @@ standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $executable $srcfile] } { +set opts {debug} + +if { [prepare_for_testing $testfile.exp $executable $srcfile $opts] } { + return -1 +} + +if {![runto_main]} { + return -1 +} + +foreach func { longest float double doublest } { with_test_prefix $func { + gdb_breakpoint wack_$func + gdb_continue_to_breakpoint wack_$func + + foreach var { l r } { with_test_prefix $var { + set test "info addr $var" + gdb_test_multiple $test $test { + -re "\r\nSymbol \"$var\" is optimized out\\.\r\n$gdb_prompt $" { + lappend opts additional_flags=-DGCC_PR_55056 + xfail "$test (register variable has no location)" + } + -re "\r\nSymbol \"$var\" is .*\r\n$gdb_prompt $" { + pass $test + } + } + }} +}} + +set executable ${testfile}opts + +if { [prepare_for_testing $testfile.exp $executable $srcfile $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.trace/collection.c b/gdb/testsuite/gdb.trace/collection.c index 3eac221..6e7bee5 100644 --- a/gdb/testsuite/gdb.trace/collection.c +++ b/gdb/testsuite/gdb.trace/collection.c @@ -124,10 +124,23 @@ int reglocal_test_func () /* test collecting register locals */ { register char locc = 11; register int loci = 12; + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register float locf = 13.3; + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register double locd = 14.4; register test_struct locst; - register int locar[4]; + /* The "register" removal is a GDB PR server/15081 workaround as it cannot + handle DW_OP_piece variables occupying more than 64 bits on gcc-4.8.0. */ +#ifndef GDB_PR_15081 + register +#endif + int locar[4]; int i; locst.memberc = 15; diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp index ed7149d..e1526e6 100644 --- a/gdb/testsuite/gdb.trace/collection.exp +++ b/gdb/testsuite/gdb.trace/collection.exp @@ -19,7 +19,43 @@ load_lib "trace-support.exp" standard_testfile set executable $testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { +set opts {debug nowarnings} + +if {[prepare_for_testing $testfile.exp $executable $srcfile $opts]} { + return -1 +} + +if {![runto reglocal_test_func]} { + return -1 +} + +foreach var { locf locd } { with_test_prefix $var { + set test "info addr $var" + gdb_test_multiple $test $test { + -re "\r\nSymbol \"$var\" is optimized out\\.\r\n$gdb_prompt $" { + lappend opts additional_flags=-DGCC_PR_55056 + xfail "$test (register variable has no location)" + } + -re "\r\nSymbol \"$var\" is .*\r\n$gdb_prompt $" { + pass $test + } + } +}} + +set test "info addr locar" +gdb_test_multiple $test $test { + -re "\r\nSymbol \"locar\" is a variable \[^\r\n\]*\\\[8-byte piece\\\]\[^\r\n\]*\\\[8-byte piece\\\]\[^\r\n\]*\\.\r\n$gdb_prompt $" { + lappend opts additional_flags=-DGDB_PR_15081 + kfail gdb/15081 "$test (GDB cannot handle >64-bit trace data))" + } + -re "\r\nSymbol \"locar\" is .*\r\n$gdb_prompt $" { + pass $test + } +} + +set executable ${testfile}opts + +if {[prepare_for_testing $testfile.exp $executable $srcfile $opts]} { return -1 } @@ -284,7 +320,7 @@ proc gdb_collect_locals_test { func mylocs msg } { # Find the comment-identified line for setting this tracepoint. set testline 0 - gdb_test_multiple "list $func, +30" "collect $msg: find tracepoint line" { + gdb_test_multiple "list $func, +43" "collect $msg: find tracepoint line" { -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+ Set_Tracepoint_Here .*$gdb_prompt" { set testline $expect_out(1,string) pass "collect $msg: find tracepoint line" diff --git a/gdb/testsuite/gdb.trace/unavailable.cc b/gdb/testsuite/gdb.trace/unavailable.cc index 77fa01d..7cf1641 100644 --- a/gdb/testsuite/gdb.trace/unavailable.cc +++ b/gdb/testsuite/gdb.trace/unavailable.cc @@ -238,10 +238,23 @@ reglocal_test_func () { register char locc = 11; register int loci = 12; + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register float locf = 13.3; + /* volatile is a GCC PR debug/55056 workaround. */ +#ifdef GCC_PR_55056 + volatile +#endif register double locd = 14.4; register test_struct locst; - register int locar[4]; + /* The "register" removal is a GDB PR server/15081 workaround as it cannot + handle DW_OP_piece variables occupying more than 64 bits on gcc-4.8.0. */ +#ifndef GDB_PR_15081 + register +#endif + int locar[4]; int i; locst.memberc = 15; diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index b776dd3..02a9bc8 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -17,9 +17,43 @@ load_lib "trace-support.exp" standard_testfile unavailable.cc set executable $testfile +set opts {debug nowarnings c++} -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ - {debug nowarnings c++}]} { +if {[prepare_for_testing $testfile.exp $executable $srcfile $opts]} { + return -1 +} + +if {![runto reglocal_test_func]} { + return -1 +} + +foreach var { locf locd } { with_test_prefix $var { + set test "info addr $var" + gdb_test_multiple $test $test { + -re "\r\nSymbol \"$var\" is optimized out\\.\r\n$gdb_prompt $" { + lappend opts additional_flags=-DGCC_PR_55056 + xfail "$test (register variable has no location)" + } + -re "\r\nSymbol \"$var\" is .*\r\n$gdb_prompt $" { + pass $test + } + } +}} + +set test "info addr locar" +gdb_test_multiple $test $test { + -re "\r\nSymbol \"locar\" is a variable \[^\r\n\]*\\\[8-byte piece\\\]\[^\r\n\]*\\\[8-byte piece\\\]\[^\r\n\]*\\.\r\n$gdb_prompt $" { + lappend opts additional_flags=-DGDB_PR_15081 + kfail gdb/15081 "$test (GDB cannot handle >64-bit trace data))" + } + -re "\r\nSymbol \"locar\" is .*\r\n$gdb_prompt $" { + pass $test + } +} + +set executable ${testfile}opts + +if {[prepare_for_testing $testfile.exp $executable $srcfile $opts]} { return -1 }

[RFC] testsuite: Workaround issues with GCC 4.8.0pre + gdb.trace new KFAIL

Commit Message

Patch