summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2004-02-29 16:51:48 +0000
committerDaniel Jacobowitz <dan@debian.org>2004-02-29 16:51:48 +0000
commit64f381742d798617ccb591795f82a280aaa868b3 (patch)
tree6e73b5daf5b965ecb2e31bfbe85f816f43e910d3
parent2b51246fceb1dd8e01f573494e2fa4f53dc1ba8e (diff)
downloadgdb-64f381742d798617ccb591795f82a280aaa868b3.tar.gz
* 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 d23e034cf96..aee188b075a 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 bb5b246a050..ed812f81aa4 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