From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13165 invoked by alias); 9 Nov 2010 05:46:21 -0000 Received: (qmail 13141 invoked by uid 22791); 9 Nov 2010 05:46:17 -0000 X-SWARE-Spam-Status: No, hits=-4.6 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.35) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 09 Nov 2010 05:46:12 +0000 Received: from wpaz5.hot.corp.google.com (wpaz5.hot.corp.google.com [172.24.198.69]) by smtp-out.google.com with ESMTP id oA95k94j005283 for ; Mon, 8 Nov 2010 21:46:09 -0800 Received: from vws6 (vws6.prod.google.com [10.241.21.134]) by wpaz5.hot.corp.google.com with ESMTP id oA95j8A6015237 for ; Mon, 8 Nov 2010 21:46:07 -0800 Received: by vws6 with SMTP id 6so1061667vws.36 for ; Mon, 08 Nov 2010 21:46:07 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.240.138 with SMTP id la10mr5930499qcb.191.1289281567547; Mon, 08 Nov 2010 21:46:07 -0800 (PST) Received: by 10.220.188.66 with HTTP; Mon, 8 Nov 2010 21:46:07 -0800 (PST) In-Reply-To: <20101109044704.GA24214@host0.dyn.jankratochvil.net> References: <1285767241.3709.3.camel@gargoyle> <20101109044704.GA24214@host0.dyn.jankratochvil.net> Date: Tue, 09 Nov 2010 05:46:00 -0000 Message-ID: Subject: Re: [PATCH] testcases: Fix assorted problems related to powerpc From: Doug Evans To: Jan Kratochvil Cc: Luis Machado , gdb-patches@sourceware.org, Pedro Alves , Edjunior Barbosa Machado Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-11/txt/msg00136.txt.bz2 On Mon, Nov 8, 2010 at 8:47 PM, Jan Kratochvil wrote: > On Wed, 29 Sep 2010 15:34:01 +0200, Luis Machado wrote: >> Updated patch without the "fix" to watch-read.exp. > > Checked-in with the same \. -> \\. change as described in: > =A0 =A0 =A0 =A0Re: [PATCH] testsuite: break-entry.exp: convert entry poin= t for ppc64 > =A0 =A0 =A0 =A0http://sourceware.org/ml/gdb-patches/2010-10/msg00057.html > > Tested on: > =A0 =A0 =A0 =A0{x86_64,x86_64-m32}-fedora14-linux-gnu > =A0 =A0 =A0 =A0{ppc64,ppc64-m32}-rhel6-linux-gnu > > > Thanks, > Jan > > > http://sourceware.org/ml/gdb-cvs/2010-11/msg00043.html > > --- src/gdb/testsuite/ChangeLog 2010/11/08 18:05:55 =A0 =A0 1.2502 > +++ src/gdb/testsuite/ChangeLog 2010/11/09 04:44:16 =A0 =A0 1.2503 > @@ -1,3 +1,13 @@ > +2010-11-09 =A0Edjunior Machado =A0 > + =A0 =A0 =A0 =A0 =A0 Luis Machado =A0 > + > + =A0 =A0 =A0 * gdb.base/maint.exp: Expect "." prefix. > + =A0 =A0 =A0 * gdb.base/nodebug.exp: Expect "." Likewise. > + =A0 =A0 =A0 * gdb.base/sepsymtab.exp: Expect "." Likewise. > + =A0 =A0 =A0 * gdb.base/watchpoint-cond-gone.exp: Likewise. > + =A0 =A0 =A0 * gdb.base/watchpoint.exp: Expect a software watch to be cr= eated for > + =A0 =A0 =A0 POWER server processors. > + > =A02010-11-08 =A0Edjunior Machado =A0 > =A0 =A0 =A0 =A0 =A0 =A0Luis Machado =A0 > > --- src/gdb/testsuite/gdb.base/maint.exp =A0 =A0 =A0 =A02010/09/08 17:22:= 26 =A0 =A0 1.48 > +++ src/gdb/testsuite/gdb.base/maint.exp =A0 =A0 =A0 =A02010/11/09 04:44:= 17 =A0 =A0 1.49 > @@ -253,7 +253,7 @@ > =A0 =A0 =A0 =A0 =A0 =A0-re "msymbols_output\r\n$gdb_prompt $" { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0send_gdb "shell grep factorial msymbols_ou= tput\n" > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0gdb_expect { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 -re "\\\[ *$decimal\\\] \[tT\]\[ \t= \]+$hex factorial.*$gdb_prompt $" { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 -re "\\\[ *$decimal\\\] \[tT\]\[ \t= \]+$hex \\.?factorial.*$gdb_prompt $" { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass "maint print msymbols" > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0-re ".*$gdb_prompt $" =A0 =A0 { fa= il "maint print msymbols" } > @@ -280,7 +280,7 @@ > =A0 =A0 =A0 =A0gdb_test_multiple "shell ls msymbols_output2" "maint print= msymbols" { > =A0 =A0 =A0 =A0 =A0 =A0-re "msymbols_output2\r\n$gdb_prompt $" { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0gdb_test_multiple "shell grep factorial ms= ymbols_output2" "maint print msymbols" { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 -re "\\\[ *$decimal\\\] \[tT\]\[ \t= \]+$hex factorial.*$gdb_prompt $" { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 -re "\\\[ *$decimal\\\] \[tT\]\[ \t= \]+$hex \\.?factorial.*$gdb_prompt $" { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass "maint print msymbols" > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0-re ".*$gdb_prompt $" { > --- src/gdb/testsuite/gdb.base/nodebug.exp =A0 =A0 =A02010/05/25 19:34:04= =A0 =A0 1.14 > +++ src/gdb/testsuite/gdb.base/nodebug.exp =A0 =A0 =A02010/11/09 04:44:17= =A0 =A0 1.15 > @@ -75,7 +75,7 @@ > > =A0 =A0 if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-i= rix5*" "mips-sgi-irix6*" } > =A0 =A0 gdb_test "p top" \ > - =A0 =A0 =A0 "\{(<(text variable|function), no debug info>|short \\(int\= \)|short \\(\\))\} \[0-9a-fx]* " > + =A0 =A0 =A0 "\{(<(text variable|function), no debug info>|short \\(int\= \)|short \\(\\))\} \[0-9a-fx]* <\\.?top(\\(int\\)|)>" > =A0 =A0 if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-i= rix5*" "mips-sgi-irix6*" } > =A0 =A0 gdb_test "whatis top" \ > =A0 =A0 =A0 =A0"(<(text variable|function), no debug info>|short \\(int\\= )|short \\(\\))" > @@ -85,7 +85,7 @@ > =A0 =A0 if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-i= rix5*" } > =A0 =A0 setup_xfail "mips-sgi-irix6*" > =A0 =A0 gdb_test "p middle" \ > - =A0 =A0 =A0 "\{(<(text variable|function), no debug info>|short \\(int\= \)|short \\(\\))\} \[0-9a-fx]* " > + =A0 =A0 =A0 "\{(<(text variable|function), no debug info>|short \\(int\= \)|short \\(\\))\} \[0-9a-fx]* <\\.?middle(\\(int\\)|)>" > =A0 =A0 if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-i= rix5*" } > =A0 =A0 setup_xfail "mips-sgi-irix6*" > =A0 =A0 gdb_test "whatis middle" \ > --- src/gdb/testsuite/gdb.base/sepsymtab.exp =A0 =A02010/01/01 07:32:01 = =A0 =A0 1.9 > +++ src/gdb/testsuite/gdb.base/sepsymtab.exp =A0 =A02010/11/09 04:44:17 = =A0 =A0 1.10 > @@ -45,7 +45,7 @@ > =A0set command "info sym main" > =A0set command_regex [string_to_regexp $command] > =A0gdb_test_multiple "$command" "$command" { > - =A0 =A0-re "^${command_regex}\[\r\n\]+main in section \[^\r\n\]+\[\r\n\= ]+$gdb_prompt \$" { > + =A0 =A0-re "^${command_regex}\[\r\n\]+\\.?main in section \[^\r\n\]+\[\= r\n\]+$gdb_prompt \$" { > =A0 =A0 =A0 =A0pass "$command" > =A0 =A0 } > =A0} > --- src/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp 2010/06/01 21:29:= 21 =A0 =A0 1.2 > +++ src/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp 2010/11/09 04:44:= 17 =A0 =A0 1.3 > @@ -46,6 +46,7 @@ > > =A0# We may stay either in the function itself or only at the first instr= uction of > =A0# its caller depending on the epilogue unwinder (or valid epilogue CFI= ) presence. > + > =A0gdb_test "finish" \ > - =A0 =A0 =A0 =A0"Watchpoint .* deleted because the program has left the = block in.*which its expression is valid..*in (jumper|func).*" \ > + =A0 =A0 =A0 =A0"Watchpoint .* deleted because the program has left the = block in.*which its expression is valid..*in (\\.?jumper|func).*" \ > =A0 =A0 =A0 =A0 "Catch the no longer valid watchpoint" > --- src/gdb/testsuite/gdb.base/watchpoint.exp =A0 2010/09/04 15:30:09 =A0= =A0 1.31 > +++ src/gdb/testsuite/gdb.base/watchpoint.exp =A0 2010/11/09 04:44:17 =A0= =A0 1.32 > @@ -683,7 +683,13 @@ > =A0 =A0 =A0 =A0 =A0 =A0"$watchpoint_msg \[0-9\]+: \\*\\(int \\*\\) 0" > =A0 =A0 =A0 =A0delete_breakpoints > > - =A0 =A0 =A0 gdb_test "watch *global_ptr" "$watchpoint_msg \[0-9\]+: \\*= global_ptr" > + =A0 =A0 =A0 # This step requires two HW watchpoints. =A0Since PPC Serve= r only has > + =A0 =A0 =A0 # a single one, it will use a SW watchpoint in this case. > + =A0 =A0 =A0 if [istarget powerpc64-*] { > + =A0 =A0 =A0 =A0 =A0 set watchpoint_msg "Watchpoint" > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 gdb_test "watch *global_ptr" "$watchpoint_msg \[0-9\]+: \\\= *global_ptr" > =A0 =A0 =A0 =A0gdb_test "set \$global_ptr_breakpoint_number =3D \$bpnum" = "" > =A0 =A0 =A0 =A0gdb_test "next" ".*global_ptr =3D buf.*" "global_ptr next" > =A0 =A0 =A0 =A0gdb_test_multiple "next" "next over ptr init" { I wonder if it would be sufficiently useful to have comments there to explain why the \\.? is present. It could even be factored out to something like set ppc_prefix "\\.?" or a function call that prepended the prefix when necessary. It feels like an obscure target-specific detail that is going to get scattered throughout the testsuite.