diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/finish.exp | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 58a304c..06520ab 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2001-05-21 Kevin Buettner <kevinb@redhat.com> + + * gdb.base/finish.exp (finish_void): Allow "finish" command to + stop on the call statement as well as the statement after the + call. + 2001-05-10 Elena Zannoni <ezannoni@redhat.com> * gdb.base/completion.exp: Revamp test. Make it execute on all diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp index abb35ed..3e2c69f 100644 --- a/gdb/testsuite/gdb.base/finish.exp +++ b/gdb/testsuite/gdb.base/finish.exp @@ -77,10 +77,17 @@ proc finish_void { } { gdb_test "continue" "Breakpoint.* void_func.*" \ "continue to void_func" send_gdb "finish\n" + # Some architectures will have one or more instructions after the + # call instruction which still is part of the call sequence, so we + # must be prepared for a "finish" to show us the void_func call + # again as well as the statement after. gdb_expect { -re ".*void_checkpoint.*$gdb_prompt $" { pass "finish from void_func" } + -re ".*call to void_func.*$gdb_prompt $" { + pass "finish from void_func" + } -re ".*$gdb_prompt $" { fail "finish from void_func" } |