* lib/gdbserver-support.exp (gdbserver_spawn): Only match full_buffer.

	(gdbserver_run): Kill any running gdbserver.
	* lib/mi-support.exp (mi_gdb_target_load): Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1f0fdd35fbaf46c14efc61b6ae3ffe406adfbef1..3b882ca9826a97026d1419878c7dc4645bb67f66 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * lib/gdbserver-support.exp (gdbserver_spawn): Only match full_buffer.
+       (gdbserver_run): Kill any running gdbserver.
+       * lib/mi-support.exp (mi_gdb_target_load): Likewise.
+
 2007-05-17  Maciej W. Rozycki  <macro@mips.com>
 
        * gdb.base/sigbpt.exp: Preset segv_addr.

diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 0a8b1117bb5c095ae71321fab7ad6fd6571c8c4c..4d8f049d2a1bb586036daa9a993ec06e2b98dc81 100644 (file)
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -222,7 +222,7 @@ proc gdbserver_spawn { child_args } {
     # don't need to redirect output.
     expect_background {
        -i $server_spawn_id
-       -re "." { }
+       full_buffer { }
        eof {
            # The spawn ID is already closed now (but not yet waited for).
            wait -i $expect_out(spawn_id)
@@ -236,6 +236,21 @@ proc gdbserver_spawn { child_args } {
 # to it.  Return 0 on success, or non-zero on failure.
 
 proc gdbserver_run { child_args } {
+    # Kill anything running before we try to start gdbserver, in case
+    # we are sharing a serial connection.
+    global gdb_prompt
+    send_gdb "kill\n"
+    gdb_expect 120 {
+       -re "Kill the program being debugged. .y or n. $" {
+           send_gdb "y\n"
+           verbose "\t\tKilling previous program being debugged"
+           exp_continue
+       }
+       -re "$gdb_prompt $" {
+           # OK.
+       }
+    }
+
     set res [gdbserver_spawn $child_args]
     set protocol [lindex $res 0]
     set gdbport [lindex $res 1]

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 6763ff527f01d145c998c3876b26faa7c330993a..c1381a5c249133fa4de7ad7beeb467803866ac64 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -454,6 +454,7 @@ proc mi_gdb_target_load { } {
     upvar timeout timeout
 
     if { [info procs gdbserver_gdb_load] != "" } {
+       mi_gdb_test "kill" ".*" ""
        set res [gdbserver_gdb_load]
        set protocol [lindex $res 0]
        set gdbport [lindex $res 1]