diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.trace/disconnected-tracing.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 15 |
3 files changed, 24 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 003208d..40391c9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2013-10-24 Maciej W. Rozycki <macro@codesourcery.com> + * lib/gdb.exp (gdb_finish): Send a kill request to `gdbserver' + if in the persistent mode. + * gdb.trace/disconnected-tracing.exp: Reconnect before completion. + +2013-10-24 Maciej W. Rozycki <macro@codesourcery.com> + * lib/gdb.exp (gdb_gcore_cmd): Also handle a "Target does not support core file generation" reply. diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp index 7598d8a..2f44324 100644 --- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp +++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp @@ -147,3 +147,6 @@ proc disconnected_tfind { } { } disconnected_tfind + +# Reconnect for a clean gdbserver shutdown. +gdb_reconnect diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index e4a6134..4bfa4b4 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -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 |