diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/shlib-call.exp | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d04ce49ade9..b2f90912502 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2020-05-06 Tom de Vries <tdevries@suse.de> + * gdb.base/shlib-call.exp: Add extra step to reach shmain.c:42, if + necessary. + +2020-05-06 Tom de Vries <tdevries@suse.de> + * lib/unbuffer_output.c (gdb_unbuffer_output): Change return type to void. diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index 806fc15157a..97e04cdbb5e 100644 --- a/gdb/testsuite/gdb.base/shlib-call.exp +++ b/gdb/testsuite/gdb.base/shlib-call.exp @@ -142,9 +142,14 @@ gdb_test_multiple "step" "step out of shr2 to main" { } -re ".*\\\}.*$gdb_prompt $" { pass "step out of shr2 to main (stopped in shr2 epilogue)" - gdb_test "step" \ - "main \\(\\) at.*g = mainshr1\\(g\\);" \ - "step out of shr2 epilogue to main" + gdb_test_multiple "step" "step out of shr2 epilogue to main" { + -re -wrap "main \\(\\) at.*g = mainshr1\\(g\\);" { + pass $gdb_test_name + } + -re -wrap "main \\(\\) at.*g = shr2\\(g\\);" { + gdb_test "step" "g = mainshr1\\(g\\);" $gdb_test_name + } + } } } |