2000-05-18 Michael Snyder <msnyder@seadog.cygnus.com>

      * gdb.base/annota1.exp (annotate-signal-handler-caller):
      Relax the regular expression a little, make it pass on Solaris 8.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0f7d436aaa80d6d79d24274a21be3cc2ec6c1121..b6f4ee5937c303d76489ec73c59f83bff3688fa0 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-18  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+       * gdb.base/annota1.exp (annotate-signal-handler-caller):
+       Relax the regular expression a little, make it pass on Solaris 8.
+
 2000-05-12  Kevin Buettner  <kevinb@redhat.com>
 
        * gdb.base/step-test.exp: On IA-64 targets, when stepping out of

diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index 9791a9c4e272f5a7331fbd6aaa3085f14884d7e4..d38858d004483a6aac95a9d7c63b9a0597451096 100644 (file)
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -277,10 +277,11 @@ match_max 3000
 verbose "match_max now is: [match_max]"
 send_gdb "backtrace\n"
 gdb_expect {
-  -re "frame-begin 0 $hex.*0.*frame-end.*frame-begin 1 $hex.*1.*(\032\032signal-handler-caller\r\n.signal handler called.\r\n\r\n)*\032\032frame-end\r\n\r\n\032\032frame-begin 2 $hex.*2.*(frame-begin 3 $hex.*3.*)*frame-end.*$gdb_prompt$" \
-       { pass "backtrace @ signal handler" }
-  -re ".*$gdb_prompt$"     { fail "backtrace @ signal handler" }
-  timeout                  { fail "backtrace @ signal handler (timeout)" }
+    -re "frame-begin 0 $hex\r\n#0.*frame-end.*frame-begin 1 $hex\r\n#1.*(\032\032signal-handler-caller\r\n.signal handler called.\r\n\r\n)*\032\032frame-end\r\n\r\n\032\032frame-begin 2 $hex\r\n#2.*(frame-begin 3 $hex\r\n#3.*)*frame-end.*$gdb_prompt$" {
+       pass "backtrace @ signal handler"
+    }
+    -re ".*$gdb_prompt$"   { fail "backtrace @ signal handler" }
+    timeout                { fail "backtrace @ signal handler (timeout)" }
 }
 
 #