2000-06-02 Michael Snyder <msnyder@seadog.cygnus.com>

       * gdb.base/annota1.exp (run until main breakpoint): Loosen up
       the regular expression: accept an (almost) arbitrary sequence of
       "frames-invalid" and "breakpoints-invalid" messages both before
       and after the "starting" message.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 471a9de3d8e5ea87f8da8540a177ed1ec8ec66f1..b46d81d93292a4dc1ce2eab2685a86dbe6c97b3f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -15,6 +15,13 @@ Wed Jun  7 13:02:40 2000  Andrew Cagney  <cagney@b1.cygnus.com>
        * gdb.c++/misc.cc: Fix ambiguous initialization with correct 
        initialization.
 
+2000-06-02  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+       * gdb.base/annota1.exp (run until main breakpoint): Loosen up
+       the regular expression: accept an (almost) arbitrary sequence of
+       "frames-invalid" and "breakpoints-invalid" messages both before
+       and after the "starting" message.
+
 2000-06-02  Michael Snyder  <msnyder@seadog.cygnus.com>
 
        * gdb.c++/local.exp: This test has never been known to work with g++.

diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index d38858d004483a6aac95a9d7c63b9a0597451096..6c1ededf2a458ac3590cef597edc67e51445bce5 100644 (file)
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -142,11 +142,16 @@ gdb_expect {
 #
 #exp_internal 1
 send_gdb "run\n"
-  gdb_expect {
-    -re "\r\n\032\032post-prompt\r\nStarting program: $binfile \(\r\n\r\n\032\032frames-invalid\)+\(\r\n\r\n\032\032breakpoints-invalid\)*.*\(\r\n\r\n\032\032frames-invalid\)*\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" \
-                           { pass "run until main breakpoint" }
-    -re ".*$gdb_prompt$"       { fail "run until main breakpoint" }
-    timeout                { fail "run until main breakpoint (timeout)" }
+gdb_expect {
+    -re "\r\n\032\032post-prompt\r\nStarting program: $binfile \(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" {
+       pass "run until main breakpoint" 
+    }
+    -re ".*$gdb_prompt$" { 
+       fail "run until main breakpoint" 
+    }
+    timeout { 
+       fail "run until main breakpoint (timeout)" 
+    }
   }
 #exp_internal 0
 #exit 0