This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] testsuite: Persistent gdbserver cleanup
- From: "Maciej W. Rozycki" <macro at codesourcery dot com>
- To: <gdb-patches at sourceware dot org>
- Date: Wed, 23 Oct 2013 23:59:16 +0100
- Subject: [PATCH] testsuite: Persistent gdbserver cleanup
- Authentication-results: sourceware.org; auth=none
Hi,
We have a number of tests that run `gdbserver' in the persistent mode, to
be able to disconnect and reconnect. That has a side effect of leaving
the `gdbserver' behind upon GDB termination at the conclusion of the
respective test cases, because no kill request is sent to `gdbserver' at
the end of session and as a result of receiving a KILL signal GDB merely
disconnects.
This causes problems in some remote test environments, such as QEMU in
the system emulation mode, where `gdbserver' is run within Linux run on
QEMU and QEMU's TCP port forwarding feature is used to communicate with
the `gdbserver'. In this case a single TCP port is used to talk to
`gdbserver' and a subsequent test case faces `gdbserver' still running
controlling the program used for the test case that has just concluded.
Killing off that `gdbserver' process, while possible, is complicated and
I think test cases should try to leave the state clean if possible, so
here's my proposal to make the harness explicitly request `gdbserver' to
terminate before killing off GDB where the persistent mode has been
requested. Additionally one test case terminated GDB in a disconnected
state, so I made it reconnect before completion.
No regressions in mips-linux-gnu testing. OK to apply?
2013-10-23 Maciej W. Rozycki <macro@codesourcery.com>
gdb/testsuite/
* lib/gdb.exp (gdb_finish): Send a kill request to `gdbserver'
if in the persistent mode.
* gdb.trace/disconnected-tracing.exp: Reconnect before completion.
Maciej
gdb-test-gdbserver-reconnect-kill.diff
Index: gdb-fsf-trunk-quilt/gdb/testsuite/gdb.trace/disconnected-tracing.exp
===================================================================
--- gdb-fsf-trunk-quilt.orig/gdb/testsuite/gdb.trace/disconnected-tracing.exp 2013-10-17 22:42:31.578765350 +0100
+++ gdb-fsf-trunk-quilt/gdb/testsuite/gdb.trace/disconnected-tracing.exp 2013-10-17 22:44:53.117689854 +0100
@@ -147,3 +147,6 @@ proc disconnected_tfind { } {
}
disconnected_tfind
+
+# Reconnect for a clean gdbserver shutdown.
+gdb_reconnect
Index: gdb-fsf-trunk-quilt/gdb/testsuite/lib/gdb.exp
===================================================================
--- gdb-fsf-trunk-quilt.orig/gdb/testsuite/lib/gdb.exp 2013-10-17 22:44:51.618780708 +0100
+++ gdb-fsf-trunk-quilt/gdb/testsuite/lib/gdb.exp 2013-10-17 22:44:53.117689854 +0100
@@ -3612,8 +3612,23 @@ proc gdb_init { args } {
}
proc gdb_finish { } {
+ global gdbserver_reconnect_p
+ global gdb_prompt
global cleanfiles
+ # Give persistent gdbserver a chance to terminate before GDB is killed.
+ if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} {
+ send_gdb "kill\n";
+ gdb_expect 10 {
+ -re "y or n" {
+ send_gdb "y\n";
+ exp_continue;
+ }
+ -re "$gdb_prompt $" {
+ }
+ }
+ }
+
# Exit first, so that the files are no longer in use.
gdb_exit