* gdb.base/annota1.exp (break handle_USR1): Make fail and pass text

	match.
	(break printf): Ditto.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dcf8c41c9301d4cf00d37ba4bc518a4583c33fa8..34ffc668126c415b170a82f6c05fbabee0bded65 100644 (file)
--- 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 246829275e2a19c1bf6c1dfd5949032c911c076a..6fac1cd34904fdbafa34a43bc99457561109eb87 100644 (file)
--- 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)" }
 }