From 5a13315d1c6993ab84075ff94797eb8c6da1f20b Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 11 Mar 2020 16:51:54 +0100 Subject: [PATCH] [gdb/testsuite] Fix stepi pattern in gdb.btrace/reconnect.exp When running gdb.btrace/reconnect.exp, I run into the follow FAIL: ... (gdb) stepi 19^M 0x00007ffff7dd8b67 59 return (ElfW(Addr)) &_DYNAMIC - \ elf_machine_dynamic ();^M (gdb) FAIL: gdb.btrace/reconnect.exp: first: stepi 19 ... The corresponding test looks like: ... gdb_test "stepi 19" "0x.* in .* from .*" ... which matches the usual: ... (gdb) stepi 19^M 0x00007ffff7dd8b67 in _dl_start () from target:/lib64/ld-linux-x86-64.so.2^M (gdb) PASS: gdb.btrace/reconnect.exp: first: stepi 19 ... which I also get when removing configure flag --with-separate-debug-dir=/usr/lib/debug. Fix this by allowing the source line pattern in the test regexp. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-03-11 Tom de Vries * gdb.btrace/reconnect.exp: Allow source line pattern after stepi. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.btrace/reconnect.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 78505f1169..5613e86261 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-03-11 Tom de Vries + + * gdb.btrace/reconnect.exp: Allow source line pattern after stepi. + 2020-03-11 Tom Tromey * gdb.dwarf2/variant.exp: Mark discriminants as artificial. diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp index 4c31577eef..26d04c38a9 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 .*" + gdb_test "stepi 19" "($hex in .* from .*|$hex\t$decimal.*)" gdb_test "info record" [multi_line \ "Active record target: .*" \