From 5c565afd4c7ab6f3d287c9abd288d1d1e3e7cade Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 23 Apr 2019 15:49:52 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.btrace/reconnect.exp with native-gdbserver When running gdb.btrace/reconnect.exp with native-gdbserver, we run into: ... FAIL: gdb.btrace/reconnect.exp: first: stepi 19 ... due to the fact that we're trying to match: ... stepi 19^M 0x00007ffff7dd8b57 in _dl_start () from /lib64/ld-linux-x86-64.so.2^M ... using pattern: ... gdb_test "stepi 19" "0x.* in .* from target.*" ... Fix this by changing the pattern to: ... gdb_test "stepi 19" "0x.* in .* from .*" ... Tested on x86_64-linux with native and native-gdbserver. gdb/testsuite/ChangeLog: 2019-04-23 Tom de Vries PR gdb/24433 * gdb.btrace/reconnect.exp: Fix stepi 19 pattern. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.btrace/reconnect.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 115623d..79c4187 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-23 Tom de Vries + + PR gdb/24433 + * gdb.btrace/reconnect.exp: Fix stepi 19 pattern. + 2019-04-23 Alan Hayward * gdb.trace/backtrace.exp: Use nopie flag. diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp index c4b41fc..e791657 100644 --- a/gdb/testsuite/gdb.btrace/reconnect.exp +++ b/gdb/testsuite/gdb.btrace/reconnect.exp @@ -51,7 +51,7 @@ gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport # Create a record, check, reconnect with_test_prefix "first" { gdb_test_no_output "record btrace" "record btrace enable" - gdb_test "stepi 19" "0x.* in .* from target.*" + gdb_test "stepi 19" "0x.* in .* from .*" gdb_test "info record" [multi_line \ "Active record target: .*" \ -- 2.7.4