From efd11a33a137b2c48728539f9d695fc1bea6fb40 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 9 Nov 2010 04:44:17 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.base/maint.exp: Expect "." prefix. * gdb.base/nodebug.exp: Expect "." Likewise. * gdb.base/sepsymtab.exp: Expect "." Likewise. * gdb.base/watchpoint-cond-gone.exp: Likewise. * gdb.base/watchpoint.exp: Expect a software watch to be created for POWER server processors. --- gdb/testsuite/ChangeLog | 10 ++++++++++ gdb/testsuite/gdb.base/maint.exp | 4 ++-- gdb/testsuite/gdb.base/nodebug.exp | 4 ++-- gdb/testsuite/gdb.base/sepsymtab.exp | 2 +- gdb/testsuite/gdb.base/watchpoint-cond-gone.exp | 3 ++- gdb/testsuite/gdb.base/watchpoint.exp | 8 +++++++- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 097c75d..1eacf9d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2010-11-09 Edjunior Machado + Luis Machado + + * gdb.base/maint.exp: Expect "." prefix. + * gdb.base/nodebug.exp: Expect "." Likewise. + * gdb.base/sepsymtab.exp: Expect "." Likewise. + * gdb.base/watchpoint-cond-gone.exp: Likewise. + * gdb.base/watchpoint.exp: Expect a software watch to be created for + POWER server processors. + 2010-11-08 Edjunior Machado Luis Machado diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 7e07fe8..8346bec 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/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 msymbols_output2 ${subdir}/${testfile}" 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 $" { diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp index a97da95..977d8bb 100644 --- a/gdb/testsuite/gdb.base/nodebug.exp +++ b/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" \ diff --git a/gdb/testsuite/gdb.base/sepsymtab.exp b/gdb/testsuite/gdb.base/sepsymtab.exp index 6138fe7..19c26c0 100644 --- a/gdb/testsuite/gdb.base/sepsymtab.exp +++ b/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" } } diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp index e3eacc9..6ab099c 100644 --- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp +++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp @@ -46,6 +46,7 @@ gdb_test "watch c if c == 30" "atchpoint \[0-9\]*.*" "Place the watchpoint" # 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" diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 01c0c1c..6721bda 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/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" { -- 2.7.4