From a040170c8fbb4dffa7085ed3204ac795ff66a9b1 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Tue, 22 Dec 2015 10:50:21 +0800 Subject: [PATCH] Add an expect for running commands with CLI jump 2016-04-05 Thomas Preud'homme Backport from master 2015-12-22 Thomas Preud'homme gdb/testsuite/ * lib/mi-support.exp (mi_run_cmd_full): Add an expect for the CLI jump case. --- gdb/testsuite/ChangeLog.arm | 7 +++++++ gdb/testsuite/lib/mi-support.exp | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 gdb/testsuite/ChangeLog.arm diff --git a/gdb/testsuite/ChangeLog.arm b/gdb/testsuite/ChangeLog.arm new file mode 100644 index 00000000000..c6716da38cc --- /dev/null +++ b/gdb/testsuite/ChangeLog.arm @@ -0,0 +1,7 @@ +2016-04-05 Thomas Preud'homme + + Backport from master + 2015-12-22 Thomas Preud'homme + + * lib/mi-support.exp (mi_run_cmd_full): Add an expect for the CLI jump + case. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index dd6c41ace1b..9c93e950f0e 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -886,6 +886,9 @@ proc mi_run_cmd_full {use_mi_command args} { # to better handle RUN. send_gdb "jump *$start\n" warning "Using CLI jump command, expect run-to-main FAIL" + gdb_expect { + -re "${run_match}&\"jump \\*${start}\\n\"\[\r\n\]+~\"Continuing at 0x\[0-9A-Fa-f\]+\\n.\"\[\r\n\]+\^running\[\r\n\]+\\*running,thread-id=\"\[^\"\]+\"\r\n${mi_gdb_prompt}" {} + } return 0 } -- 2.47.2