2005-04-27 Paul Gilliam <pgilliam@us.ibm.com>

        * gdb.base/annota1.exp : Deal with messages caused by breakpoints in
        shared objects being adjusted and update copyright.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 349cce6066145b0abcf44ddd7e7d17f02582db95..78d0c077c7202348e52879db78f250d95f02b52d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27  Paul Gilliam  <pgilliam@us.ibm.com>
+
+        * gdb.base/annota1.exp : Deal with messages caused by breakpoints in
+        shared objects being adjusted and update copyright years.
+
 2005-04-27  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * ChangeLog: Correct some 2003-01-13 dates.

diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index a521aea1092d154e1ecccfdd10db6883a8ef8ebd..2fcd7b52975959427fed3f61e7dec0423e568f67 100644 (file)
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -1,4 +1,4 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -229,6 +229,8 @@ 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" }
+  -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"}
   -re ".*$gdb_prompt$"     { fail "break printf" }
   timeout                  { fail "break printf (timeout)" }
 }
@@ -240,6 +242,9 @@ send_gdb "continue\n"
 gdb_expect {
   -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*\032\032frame-function-name\r\nprintf\r\n\032\032frame-args\r\n.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
          { pass "continue to printf" }
+  -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\nwarning: Breakpoint 3 address previously adjusted from $hex to $hex.\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*.*\032\032frame-function-name\r\n.printf\r\n\032\032frame-args\r\n.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
+         { pass "continue to printf" }
+
   -re ".*$gdb_prompt$"     { fail "continue to printf" }
   timeout                  { fail "continue to printf (timeout)" }
 }