* gdb.base/attach.exp: When trying to attach to a nonexistent

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / signals.exp

diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index adbb95b722393eeaafb5d92d4de3a9a340a52085..be974550e21925e9da1cd49a12728ccf3aa1e1c9 100644 (file)
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -185,7 +185,7 @@ proc signal_tests_1 {} {
        # #2, #3, or higher.  At some point this should be fixed (but
        # it quite possibly would introduce new FAILs on some systems).
        setup_xfail "i*86-*-bsdi2.0"
-       gdb_test "backtrace 10" "#0.*handler.*#1.*#2.*main.*" \
+       gdb_test "backtrace 10" "#0.*handler.*#1.*signal handler.*#2.* main .*" \
            "backtrace in signals_tests_1"
 
        gdb_test "break func1" "Breakpoint \[0-9\]+ .*"
@@ -370,6 +370,9 @@ gdb_expect {
 }
 
 if [runto_main] then {
+    # Since count is a static variable outside main, runto_main
+    # is no guarantee that count will be 0 at this point.
+    gdb_test "set variable count = 0" ""
     gdb_test "break handler if 0" "Breakpoint \[0-9\]+ .*"
     gdb_test "set \$handler_breakpoint_number = \$bpnum" ""
 
@@ -412,7 +415,7 @@ The program being debugged stopped while in a function called from GDB.*" \
     # But we should be able to backtrace...
     # On alpha-*-osf2.0 this test works when run manually but sometime fails when
     # run under dejagnu, making it very hard to debug the problem.  Weird...
-    gdb_test "bt 10" "#0.*handler.*#1.*#2.*main.*" "bt in signals.exp"
+    gdb_test "bt 10" "#0.*handler.*#1.*signal handler.*#2.* main .*" "bt in signals.exp"
     # ...and continue...
     gdb_test "continue" "Continuing\\." "continue in signals.exp"
     # ...and then count should have been incremented