* lib/gdb.exp: Fix runto.

	* gdb.base/signals.exp: Check for a gdb,nosignals feature of
	the target.

	* gdb.base/watchpoint.exp: Fix regexp.

Random miscellaneous fixes. Gotta dig up all these global variables someday..

diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index cb3094f1673ef25a23727e15f1d26bf8c6a9bb60..a362b38ca3ad7d3e13fb96c63fb12ef2f9fd53a4 100644 (file)
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -1,7 +1,7 @@
-if $nosignals {
-       verbose "Skipping signals.exp because of nosignals."
-       continue
-       }
+if [target_info exists gdb,nosignals] {
+    verbose "Skipping signals.exp because of nosignals."
+    continue
+}
 
 if $tracelevel then {
        strace $tracelevel

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 0a9e30746710c531c0a68b2425a5886637e5c3ed..616fb63f417afc6da5a19b5e9f712a4937fd1958 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -379,7 +379,7 @@ proc test_stepping {} {
 
        send_gdb "finish\n"
        expect {
-           -re "Run.*exit from.*marker1.*main.* at" { }
+           -re "Run.*exit from.*marker1.* at" { }
            default { fail "finish from marker1" ; return }
        }
        expect {

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index e6d86f25a47721eaf85110b41d3c1109fe0d3d05..31b72ff838e94634379de2de3b3d0d33a06ead0a 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -267,6 +267,7 @@ proc runto { function } {
            return 0
        }
     }
+    return 1
 }
 
 #