aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hayward <alan.hayward@arm.com>2019-05-21 10:11:51 +0100
committerAlan Hayward <alan.hayward@arm.com>2019-05-21 10:42:24 +0100
commitce3ebcaae382a3f95530d633e6875f97e53ef273 (patch)
tree84d7b9b57bd9671aeda3c77edb120636b3d3206d
parente2d1595531b62487749e1af680d8f0c48c684feb (diff)
downloadgdb-ce3ebcaae382a3f95530d633e6875f97e53ef273.zip
gdb-ce3ebcaae382a3f95530d633e6875f97e53ef273.tar.gz
gdb-ce3ebcaae382a3f95530d633e6875f97e53ef273.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/lib/gdbserver-support.exp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5cfad27..176b7f7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-21 Alan Hayward <alan.hayward@arm.com>
+
+ * lib/gdbserver-support.exp (gdbserver_run): Mark kill as optional.
+
2019-05-18 Andrew Burgess <andrew.burgess@embecosm.com>
PR gdb/18644
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 2ccc717..ade99c0 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"