From ce3ebcaae382a3f95530d633e6875f97e53ef273 Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Tue, 21 May 2019 10:11:51 +0100 Subject: [PATCH] testsuite: Mark the kill in gdbserver_run as optional This matches the kill in gdb_file_cmd, and ensures that the command is not sent to the gdb.in file. When gdb.in is used as a batch file, any kill commands run before the target is started will cause gdb to stop processing commands. gdb/testsuite/ChangeLog: * lib/gdbserver-support.exp (gdbserver_run): Mark kill as optional. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/gdbserver-support.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5cfad2754e6..176b7f74bec 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-05-21 Alan Hayward + + * lib/gdbserver-support.exp (gdbserver_run): Mark kill as optional. + 2019-05-18 Andrew Burgess PR gdb/18644 diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 2ccc717ef60..ade99c0ea16 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -484,7 +484,7 @@ proc gdbserver_run { child_args } { # Kill anything running before we try to start gdbserver, in case # we are sharing a serial connection. global gdb_prompt - send_gdb "kill\n" + send_gdb "kill\n" optional gdb_expect 120 { -re "Kill the program being debugged. .y or n. $" { send_gdb "y\n" -- 2.30.2