diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fde7135..d808217 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2020-05-06 Tom de Vries <tdevries@suse.de> + * gdb.base/watchpoint-reuse-slot.exp (stepi): Print $pc to get current + address. + +2020-05-06 Tom de Vries <tdevries@suse.de> + * gdb.base/watchpoint-reuse-slot.exp: Fix incorrect assignment. 2020-05-06 Tom de Vries <tdevries@suse.de> diff --git a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp index 83b9703..3d3d3c4 100644 --- a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp +++ b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp @@ -66,8 +66,8 @@ proc stepi {} { set srcline " for (i = 0; i < 100000; i++); /* stepi line */" set test "stepi advanced" gdb_test_multiple "stepi" $test { - -re "($hex).*[string_to_regexp $srcline]\r\n$gdb_prompt $" { - set addr $expect_out(1,string) + -re -wrap "[string_to_regexp $srcline]" { + set addr [get_valueof "/x" "\$pc" "0"] if {$addr != $cur_addr} { pass $test } else { |