diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/annota1.exp | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index dcf8c41..34ffc66 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-03-30 Doug Evans <dje@google.com> + + * gdb.base/annota1.exp (break handle_USR1): Make fail and pass text + match. + (break printf): Ditto. + 2010-03-29 Sami Wagiaalla <swagiaal@redhat.com> * gdb.cp/nsusing.exp: Marked imported declaration test as xfail with diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 2468292..6fac1cd 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -218,9 +218,9 @@ gdb_expect { send_gdb "break handle_USR1\n" gdb_expect { -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n$gdb_prompt$" \ - { pass "breakpoint handle_USR1" } - -re ".*$gdb_prompt$" { fail "break at handle_USR1" } - timeout { fail "break at handle_USR1 (timeout)" } + { pass "break handle_USR1" } + -re ".*$gdb_prompt$" { fail "break handle_USR1" } + timeout { fail "break handle_USR1 (timeout)" } } # @@ -229,9 +229,9 @@ gdb_expect { send_gdb "break printf\n" gdb_expect { -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \ - { pass "breakpoint printf" } + { pass "break printf" } -re "\r\n\032\032post-prompt\r\nwarning: Breakpoint address adjusted from $hex to $hex.\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \ - { pass "breakpoint printf"} + { pass "break printf" } -re ".*$gdb_prompt$" { fail "break printf" } timeout { fail "break printf (timeout)" } } |