aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@codesourcery.com>2014-09-09 16:06:15 +0100
committerMaciej W. Rozycki <macro@codesourcery.com>2014-09-09 16:06:15 +0100
commit2bdd10b78e7e5b33c488af6fcb01255269e8a498 (patch)
tree1ec1647201ddede2be15c6305068c3aee627a072
parent72fde3dfe9a2367abc593684b9b4d2343d367d85 (diff)
downloadgdb-2bdd10b78e7e5b33c488af6fcb01255269e8a498.zip
gdb-2bdd10b78e7e5b33c488af6fcb01255269e8a498.tar.gz
gdb-2bdd10b78e7e5b33c488af6fcb01255269e8a498.tar.bz2
GDB/testsuite: Extend the time gdbserver is waited for
Gdbserver support code uses the global timeout value to determine when to stop waiting for a gdbserver process being started to respond before continuing anyway. This timeout is usually as low as 10s and may not be enough in this context, for example on the first run where the filesystem cache is cold, even if it is elsewhere. E.g. I observe this reliably with gdbserver started the first time in QEMU running in the system emulation mode: (gdb) file .../gdb.base/advance Reading symbols from .../gdb.base/advance...done. (gdb) delete breakpoints (gdb) info breakpoints No breakpoints or watchpoints. (gdb) break main Breakpoint 1 at 0x87f8: file .../gdb.base/advance.c, line 41. (gdb) set remotetimeout 15 (gdb) kill The program is not being run. (gdb) [...] .../bin/gdbserver --once :6014 advance target remote localhost:6014 Remote debugging using localhost:6014 Remote communication error. Target disconnected.: Connection reset by peer. (gdb) continue The program is not being run. (gdb) Process advance created; pid = 999 Listening on port 6014 FAIL: gdb.base/advance.exp: Can't run to main -- notice how the test harness proceeded with the `target remote ...' command even though gdbserver hasn't completed its startup yet. A while later when it's finally ready it's too late already. I checked the timing here and it takes gdbserver roughly 25 seconds to start in this scenario. Subsequent gdbserver starts in the same test run take less time and usually complete within 10 seconds although occasionally `target remote ...' precedes the corresponding `Listening on port...' message again. Therefore I have fixed this problem by setting an explicit timeout to 120s on the expect call in question. If this turns out too arbitrary sometime, then perhaps a separate `gdbserver_timeout' setting might be due. * lib/gdbserver-support.exp (gdbserver_start): Set timeout to 120 on waiting for the TCP socket to open.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/gdbserver-support.exp1
2 files changed, 6 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3fc2680..4d2933c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-09 Maciej W. Rozycki <macro@codesourcery.com>
+
+ * lib/gdbserver-support.exp (gdbserver_start): Set timeout to
+ 120 on waiting for the TCP socket to open.
+
2014-09-09 Doug Evans <xdje42@gmail.com>
* gdb.base/default.exp (show_conv_list): Add _caller_is,
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 8c91e28..e3cae63 100644
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -275,6 +275,7 @@ proc gdbserver_start { options arguments } {
# Wait for the server to open its TCP socket, so that GDB can connect.
expect {
-i $server_spawn_id
+ -timeout 120
-notransfer
-re "Listening on" { }
-re "Can't bind address: Address already in use\\.\r\n" {