* config/sh.exp: New file.

	* config/slite.exp: Try to connect multiple times to the board
	before rebooting. Only send a "monitor run" if need_monitor_run
	is set.

	* gdb.base/break.exp: Don't do the "stub continue" test if
	the target has gdb_stub set.

	* gdb.base/callfuncs.exp: Increase the timeout.

	* gdb.base/interrupt.exp: Don't even try to compile the testcase
	if the target has gdb,noinferiorio set.

	* gdb.base/list.exp: Increase match_max to 10000 characters.

	* gdb.base/sigall.exp: Check for gdb,nosignals on the target.

	* gdb.base/watchpoint.exp: Check for gdb,noinferiorio on the
	target.

	* lib/gdb.exp(gdb_run_cmd): Fix for targets that use stubs.

Misc fixes for sparclite and SH.

diff --git a/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize
index 4c407cdfec67579d3ebb0f4256c2ea8f8ac37651..e4b80d74637e2ec722d8dc62c1cbb8d539d39755 100644 (file)
--- a/gdb/testsuite/config/.Sanitize
+++ b/gdb/testsuite/config/.Sanitize
@@ -56,6 +56,7 @@ mt-vxworks
 netware.exp
 nind.exp
 rom68k.exp
+sh.exp
 sim.exp
 slite.exp
 udi.exp

diff --git a/gdb/testsuite/config/sh.exp b/gdb/testsuite/config/sh.exp
new file mode 100644 (file)
index 0000000..1a2f7a9
--- /dev/null
+++ b/gdb/testsuite/config/sh.exp
@@ -0,0 +1 @@
+load_lib ../config/monitor.exp

diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index a027b2f918d485c2f305cc5106d1372d029b3339..099fd2769cdbbd070a886038bd6b7ab381f8d846 100644 (file)
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -157,8 +157,9 @@ if ![target_info exists use_gdb_stub] {
     timeout                { fail "run until function breakpoint (timeout)" }
   }
 } else {
-    gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:60.*60\[\t \]+if .argc.*\{" \
-           "stubs continue"
+    if ![target_info exists gdb_stub] {
+       gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:60.*60\[\t \]+if .argc.*\{" "stub continue"
+    }
 }
 
 #
@@ -308,6 +309,8 @@ proc test_next_with_recursion {} {
 
     delete_breakpoints
 
+    set timeout 20;
+
     gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
            "next over recursive call"
 

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 25308dfa9a52ccd1a957e0d165fcaa45a5b1cfbf..e4bf9b4230dc15d9b5e6eb91bc97cdbd421a97ef 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -372,10 +372,9 @@ proc test_stepping {} {
 # Test stepping and other mundane operations with watchpoints enabled
 proc test_watchpoint_triggered_in_syscall {} {
     global gdb_prompt
-    global noinferiorio
     global noresults
 
-    if $noinferiorio {
+    if [target_info exists gdb,noinferiorio] {
        verbose "Skipping test_watchpoint_triggered_in_syscall due to noinferiorio"
        return
     }

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index a49200410f0367087b1229cdb42445a521e71d53..157c2109d9c53fc3a18a3d5cbed3fe016ce38794 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -182,12 +182,14 @@ proc gdb_run_cmd {args} {
     if [target_info exists use_gdb_stub] {
        send_gdb  "jump *start\n"
        expect {
+           -re "Continuing at \[^\r\n\]*\[\r\n\]" {
+               if ![target_info exists gdb_stub] {
+                   return;
+               }
+           }
            -re "Line.* Jump anyway.*y or n. $" {
                send_gdb "y\n"
-               expect {
-                   -re "Continuing.*$gdb_prompt $" {}
-                   timeout { perror "Jump to start() failed (timeout)"; return }
-               }
+               exp_continue;
             }
            -re "No symbol.*context.*$gdb_prompt $" {}
            -re "The program is not being run.*$gdb_prompt $" {
@@ -195,7 +197,13 @@ proc gdb_run_cmd {args} {
            }
            timeout { perror "Jump to start() failed (timeout)"; return }
        }
-       send_gdb "continue\n"
+       if [target_info exists gdb_stub] {
+           expect {
+               -re ".*$gdb_prompt $" {
+                   send_gdb "continue\n"
+               }
+           }
+       }
        return
     }
     send_gdb "run $args\n"
@@ -255,7 +263,7 @@ proc runto { function } {
        -re "Break.* at .*:$decimal.*$gdb_prompt $" {
            return 1
        }
-       -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in $function.*$gdb_prompt $" { 
+       -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { 
            return 1
        }
        -re "$gdb_prompt $" {