This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] testcases: Fix assorted problems related to powerpc
- From: Luis Machado <luisgpm at linux dot vnet dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Cc: Pedro Alves <pedro at codesourcery dot com>
- Date: Wed, 29 Sep 2010 10:34:01 -0300
- Subject: Re: [PATCH] testcases: Fix assorted problems related to powerpc
- Reply-to: luisgpm at linux dot vnet dot ibm dot com
Updated patch without the "fix" to watch-read.exp.
2010-09-29 Edjunior Machado <emachado@br.ibm.com>
Luis Machado <luisgpm@br.ibm.com>
* 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]* <top(\\(int\\)|)>"
+ "\{(<(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]* <middle(\\(int\\)|)>"
+ "\{(<(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" {