diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0f7d436aaa..b6f4ee5937 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2000-05-18 Michael Snyder + + * 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 * 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 9791a9c4e2..d38858d004 100644 --- 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)" } } #