From 93881d869a6043cf0f39c0b5058ed23b504d5521 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Wed, 6 Apr 2016 14:34:02 +0100 Subject: [PATCH] Revert "Add an expect for running commands with CLI jump" This reverts commit a040170c8fbb4dffa7085ed3204ac795ff66a9b1. --- gdb/testsuite/ChangeLog.arm | 11 +++++++++++ gdb/testsuite/lib/mi-support.exp | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog.arm b/gdb/testsuite/ChangeLog.arm index c6716da38cc..e0c98d9d7d6 100644 --- a/gdb/testsuite/ChangeLog.arm +++ b/gdb/testsuite/ChangeLog.arm @@ -1,3 +1,14 @@ +2016-04-06 Thomas Preud'homme + + Revert + 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. + 2016-04-05 Thomas Preud'homme Backport from master diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 9c93e950f0e..dd6c41ace1b 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -886,9 +886,6 @@ 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.3