* config/mips-gdb.exp (gdb_load): Increase timeout to 2400.

Rework board rebooting slightly.
	(gdb_exit): Don't exit from the remote shell; there isn't one.
	* gdb.stabs/weird.exp: If a program is being debugged already,
	kill it.
	* gdb.t04/setvar.exp: Stop and restart gdb.
	* gdb.t05/expr.exp: Likewise.
	* gdb.t07/watchpoint.exp: If target is mips-idt-*, stop and
	restart gdb and reload the program.
	* gdb.t08/opaque.exp: Likewise.
	* gdb.t12/scope.exp: Likewise.
	* gdb.t13/bitfields.exp: Likewise.
	* gdb.t15/funcargs.exp: Likewise.
	* gdb.t20/classes.exp: Likewise.
	* gdb.t03/ptype.exp: Increase timeout.
	* gdb.t16/printcmds.exp (test_print_string_constants,
	test_print_array_constants): Likewise.
	* gdb.t17/callfuncs.exp (do_function_calls): Likewise.
	* gdb.t20/classes.exp (do_tests): Likewise.
	* gdb.t22/virtfunc.exp (test_virtual_calls): Likewise.

gdb/testsuite/ChangeLog

@@ -1,3 +1,26 @@
+Thu Sep 16 13:45:44 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config/mips-gdb.exp (gdb_load): Increase timeout to 2400.
+	Rework board rebooting slightly.
+	(gdb_exit): Don't exit from the remote shell; there isn't one.
+	* gdb.stabs/weird.exp: If a program is being debugged already,
+	kill it.
+	* gdb.t04/setvar.exp: Stop and restart gdb.
+	* gdb.t05/expr.exp: Likewise.
+	* gdb.t07/watchpoint.exp: If target is mips-idt-*, stop and
+	restart gdb and reload the program.
+	* gdb.t08/opaque.exp: Likewise.
+	* gdb.t12/scope.exp: Likewise.
+	* gdb.t13/bitfields.exp: Likewise.
+	* gdb.t15/funcargs.exp: Likewise.
+	* gdb.t20/classes.exp: Likewise.
+	* gdb.t03/ptype.exp: Increase timeout.
+	* gdb.t16/printcmds.exp (test_print_string_constants,
+	test_print_array_constants): Likewise.
+	* gdb.t17/callfuncs.exp (do_function_calls): Likewise.
+	* gdb.t20/classes.exp (do_tests): Likewise.
+	* gdb.t22/virtfunc.exp (test_virtual_calls): Likewise.
+
 Wed Sep 15 14:24:36 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* gdb.stabs: Renamed *wierd* to *weird*.

gdb/testsuite/config/mips-gdb.exp

@@ -79,7 +79,7 @@ proc gdb_load { arg } {
     if $verbose>1 then {
 	send_user "Loading $arg into $GDB\n"
     }
-    set timeout 1200
+    set timeout 2400
     expect {
 	-re "Loading.*$prompt $" {
 	    if $verbose>1 then {
@@ -130,16 +130,25 @@ proc gdb_start { } {
 	    set baud 9600
 	}
 	set shell_id [ eval $connectmode "$targetname" $baud ]
-	send -i $shell_id "\CC"
-	expect -i $shell_id {
-	    -re "<IDT>$" { }
-	    timeout     { error "(timeout) board did not come up."; return -1 }
-	}
-	send -i $shell_id "go 0xbfc00000"
-	expect -i $shell_id {
-	    -re "<IDT>$" { }
+	send -i $shell_id "\n"
+	expect {
+	    -i $shell_id -re "<IDT>$" { }
+	    timeout {
+		send -i $shell_id "\CC"
+		expect {
+		    -i $shell_id -re "<IDT>$" { }
+		    timeout {
+			error "(timeout) board did not come up."; return -1
+		    }
+		}
+	    }
+	}
+	send -i $shell_id "go 0xbfc00000\n"
+	expect {
+	    -i $shell_id -re "<IDT>$" { }
 	    timeout     { error "(timeout) board did not come up."; return -1 }
 	}
+	verbose "about to exit kermit"
 	exit_remote_shell $shell_id
     }
 
@@ -204,8 +213,6 @@ expect_after {
 }
 
 proc gdb_exit { } {
-    global shell_id
-    exit_remote_shell $shell_id
     catch default_gdb_exit
 }
 

gdb/testsuite/gdb.stabs/weird.exp

@@ -236,6 +236,10 @@ if ![file exists $binfile] then {
 		-re "^file \[^ \]*\r*\nReading symbols from $binfile\.\.\.done\.\r*\n$prompt $" {
 			pass "weird.o read without error"
 		}
+		-re "A program is being debugged already.  Kill it\? \(y or n\)" {
+		    send "y\n"
+		    continue -expect
+		}
 		-re ".*$prompt $" {
 			fail "Errors reading weird.o"
 		}