aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2020-03-11 16:51:54 +0100
committerTom de Vries <tdevries@suse.de>2020-03-11 16:51:54 +0100
commit5a13315d1c6993ab84075ff94797eb8c6da1f20b (patch)
tree9a8a31169abc990b50b06693b65b31ca58e7ca61 /gdb
parente7a82140af00e632f06e27d0ec9ad1f4fb704d92 (diff)
downloadgdb-5a13315d1c6993ab84075ff94797eb8c6da1f20b.zip
gdb-5a13315d1c6993ab84075ff94797eb8c6da1f20b.tar.gz
gdb-5a13315d1c6993ab84075ff94797eb8c6da1f20b.tar.bz2
[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 <tdevries@suse.de> * gdb.btrace/reconnect.exp: Allow source line pattern after stepi.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.btrace/reconnect.exp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 78505f1..5613e86 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-11 Tom de Vries <tdevries@suse.de>
+
+ * gdb.btrace/reconnect.exp: Allow source line pattern after stepi.
+
2020-03-11 Tom Tromey <tromey@adacore.com>
* 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 4c31577..26d04c3 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: .*" \