aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2004-02-29 16:51:48 +0000
committerDaniel Jacobowitz <drow@false.org>2004-02-29 16:51:48 +0000
commit23b23974c756a3f1febd4261a0a3e0e044671446 (patch)
tree7b94b35dcacef827be303c25ac55a06056832b4b
parentdc3f888344570174f93c1173793f0a1c88a08539 (diff)
downloadgdb-23b23974c756a3f1febd4261a0a3e0e044671446.zip
gdb-23b23974c756a3f1febd4261a0a3e0e044671446.tar.gz
gdb-23b23974c756a3f1febd4261a0a3e0e044671446.tar.bz2
* config/gdbserver.exp (gdbserver_gdb_load): Wait for a complete
line of output.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/config/gdbserver.exp6
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d23e034..aee188b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29 Daniel Jacobowitz <drow@mvista.com>
+
+ * config/gdbserver.exp (gdbserver_gdb_load): Wait for a complete
+ line of output.
+
2004-02-28 Daniel Jacobowitz <drow@mvista.com>
* gdb.base/relocate.c (dummy): Initialize.
diff --git a/gdb/testsuite/config/gdbserver.exp b/gdb/testsuite/config/gdbserver.exp
index bb5b246..ed812f8 100644
--- a/gdb/testsuite/config/gdbserver.exp
+++ b/gdb/testsuite/config/gdbserver.exp
@@ -144,11 +144,13 @@ proc gdbserver_gdb_load { server_exec } {
"$gdbserver $sockethost$portnum $server_exec"]
}
- # Wait for the server to produce at least one character of output.
+ # Wait for the server to produce at least one line and an additional
+ # character of output. This will wait until any TCP socket has been
+ # created, so that GDB can connect.
expect {
-i $server_spawn_id
-notransfer
- -re . { }
+ -re ".*\n." { }
}
# We can't just call close, because if gdbserver is local then that means