diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 77393253baf..2000dbed2c7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-04-16 Pedro Alves + + * boards/native-extended-gdbserver.exp (mi_gdb_start): Don't start + a new gdbserver if gdbserver_reconnect_p is set. + 2015-04-16 Pedro Alves * lib/gdbserver-support.exp (gdb_exit): If gdbserver_reconnect_p diff --git a/gdb/testsuite/boards/native-extended-gdbserver.exp b/gdb/testsuite/boards/native-extended-gdbserver.exp index 8d299ef3f63..744e044e58a 100644 --- a/gdb/testsuite/boards/native-extended-gdbserver.exp +++ b/gdb/testsuite/boards/native-extended-gdbserver.exp @@ -64,14 +64,19 @@ if { [info procs extended_gdbserver_mi_gdb_start] == "" } { rename mi_gdb_start extended_gdbserver_mi_gdb_start } proc mi_gdb_start { args } { + global gdbserver_reconnect_p + # Spawn GDB. set res [extended_gdbserver_mi_gdb_start $args] if { $res } { return $res } - # And then GDBserver, ready for extended-remote mode. - mi_gdbserver_start_multi + # And then spawn GDBserver and connect to it in extended-remote + # mode, unless the test wants to explicitly test reconnection. + if {![info exists gdbserver_reconnect_p] || !$gdbserver_reconnect_p} { + mi_gdbserver_start_multi + } return 0 }