From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1219 invoked by alias); 29 Sep 2010 13:34:17 -0000 Received: (qmail 1093 invoked by uid 22791); 29 Sep 2010 13:34:16 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from e24smtp04.br.ibm.com (HELO e24smtp04.br.ibm.com) (32.104.18.25) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 29 Sep 2010 13:34:07 +0000 Received: from mailhub3.br.ibm.com (mailhub3.br.ibm.com [9.18.232.110]) by e24smtp04.br.ibm.com (8.14.4/8.13.1) with ESMTP id o8TDSsha016257 for ; Wed, 29 Sep 2010 10:28:54 -0300 Received: from d24av05.br.ibm.com (d24av05.br.ibm.com [9.18.232.44]) by mailhub3.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o8TDeAvh2908322 for ; Wed, 29 Sep 2010 10:40:10 -0300 Received: from d24av05.br.ibm.com (loopback [127.0.0.1]) by d24av05.br.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o8TDY3gf032518 for ; Wed, 29 Sep 2010 10:34:03 -0300 Received: from [9.18.200.98] ([9.18.200.98]) by d24av05.br.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o8TDY2CB032511 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 29 Sep 2010 10:34:03 -0300 Subject: Re: [PATCH] testcases: Fix assorted problems related to powerpc From: Luis Machado Reply-To: luisgpm@linux.vnet.ibm.com To: gdb-patches@sourceware.org Cc: Pedro Alves Content-Type: text/plain; charset="UTF-8" Date: Wed, 29 Sep 2010 16:32:00 -0000 Message-ID: <1285767241.3709.3.camel@gargoyle> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit 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-09/txt/msg00487.txt.bz2 Updated patch without the "fix" to watch-read.exp. 2010-09-29 Edjunior Machado Luis Machado * testsuite/gdb.base/maint.exp: Expect "." prefix. * testsuite/gdb.base/nodebug.exp: Expect "." Likewise. * testsuite/gdb.base/sepsymtab.exp: Expect "." Likewise. * testsuite/gdb.base/watchpoint-cond-gone.exp: Likewise. * testsuite/gdb.base/watchpoint.exp: Expect a software watch to be created for POWER server processors. Index: gdb/testsuite/gdb.base/maint.exp =================================================================== --- gdb.orig/testsuite/gdb.base/maint.exp +++ gdb/testsuite/gdb.base/maint.exp @@ -253,7 +253,7 @@ gdb_expect { -re "msymbols_output\r\n$gdb_prompt $" { send_gdb "shell grep factorial msymbols_output\n" gdb_expect { - -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex factorial.*$gdb_prompt $" { + -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \.?factorial.*$gdb_prompt $" { pass "maint print msymbols" } -re ".*$gdb_prompt $" { fail "maint print msymbols" } @@ -280,7 +280,7 @@ gdb_test_multiple "maint print msymbols gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" { -re "msymbols_output2\r\n$gdb_prompt $" { gdb_test_multiple "shell grep factorial msymbols_output2" "maint print msymbols" { - -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex factorial.*$gdb_prompt $" { + -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \.?factorial.*$gdb_prompt $" { pass "maint print msymbols" } -re ".*$gdb_prompt $" { Index: gdb/testsuite/gdb.base/nodebug.exp =================================================================== --- gdb.orig/testsuite/gdb.base/nodebug.exp +++ gdb/testsuite/gdb.base/nodebug.exp @@ -75,7 +75,7 @@ if [runto inner] then { if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" "mips-sgi-irix6*" } gdb_test "p top" \ - "\{(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))\} \[0-9a-fx]* " + "\{(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))\} \[0-9a-fx]* <\.?top(\\(int\\)|)>" if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" "mips-sgi-irix6*" } gdb_test "whatis top" \ "(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))" @@ -85,7 +85,7 @@ if [runto inner] then { if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" } setup_xfail "mips-sgi-irix6*" gdb_test "p middle" \ - "\{(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))\} \[0-9a-fx]* " + "\{(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))\} \[0-9a-fx]* <\.?middle(\\(int\\)|)>" if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" } setup_xfail "mips-sgi-irix6*" gdb_test "whatis middle" \ Index: gdb/testsuite/gdb.base/sepsymtab.exp =================================================================== --- gdb.orig/testsuite/gdb.base/sepsymtab.exp +++ gdb/testsuite/gdb.base/sepsymtab.exp @@ -45,7 +45,7 @@ gdb_load ${binfile} set command "info sym main" set command_regex [string_to_regexp $command] gdb_test_multiple "$command" "$command" { - -re "^${command_regex}\[\r\n\]+main in section \[^\r\n\]+\[\r\n\]+$gdb_prompt \$" { + -re "^${command_regex}\[\r\n\]+\.?main in section \[^\r\n\]+\[\r\n\]+$gdb_prompt \$" { pass "$command" } } Index: gdb/testsuite/gdb.base/watchpoint-cond-gone.exp =================================================================== --- gdb.orig/testsuite/gdb.base/watchpoint-cond-gone.exp +++ gdb/testsuite/gdb.base/watchpoint-cond-gone.exp @@ -46,6 +46,7 @@ gdb_test "watch c if c == 30" "atchpoint # We may stay either in the function itself or only at the first instruction of # its caller depending on the epilogue unwinder (or valid epilogue CFI) presence. + gdb_test "finish" \ - "Watchpoint .* deleted because the program has left the block in.*which its expression is valid..*in (jumper|func).*" \ + "Watchpoint .* deleted because the program has left the block in.*which its expression is valid..*in (\.?jumper|func).*" \ "Catch the no longer valid watchpoint" Index: gdb/testsuite/gdb.base/watchpoint.exp =================================================================== --- gdb.orig/testsuite/gdb.base/watchpoint.exp +++ gdb/testsuite/gdb.base/watchpoint.exp @@ -683,7 +683,13 @@ proc test_inaccessible_watchpoint {} { "$watchpoint_msg \[0-9\]+: \\*\\(int \\*\\) 0" delete_breakpoints - gdb_test "watch *global_ptr" "$watchpoint_msg \[0-9\]+: \\*global_ptr" + # This step requires two HW watchpoints. Since PPC Server only has + # a single one, it will use a SW watchpoint in this case. + if [istarget powerpc64-*] { + set watchpoint_msg "Watchpoint" + } + + gdb_test "watch *global_ptr" "$watchpoint_msg \[0-9\]+: \\\*global_ptr" gdb_test "set \$global_ptr_breakpoint_number = \$bpnum" "" gdb_test "next" ".*global_ptr = buf.*" "global_ptr next" gdb_test_multiple "next" "next over ptr init" {