diff options
| author | Daniel Jacobowitz <drow@false.org> | 2007-10-02 14:57:46 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2007-10-02 14:57:46 +0000 |
| commit | 471ba8c90c7a40273fabd5821b1a10125463f3fa (patch) | |
| tree | 0d42b90c7595bf96b188281833c20a36381f87ae /gdb/testsuite/gdb.cp | |
| parent | e42e4a8b9ea03a49d9a323c8dafaa074815e76aa (diff) | |
| download | gdb-471ba8c90c7a40273fabd5821b1a10125463f3fa.zip gdb-471ba8c90c7a40273fabd5821b1a10125463f3fa.tar.gz gdb-471ba8c90c7a40273fabd5821b1a10125463f3fa.tar.bz2 | |
* gdb.cp/classes.exp (do_tests): Always step to the line after the
call.
* gdb.mi/mi-simplerun.exp (test_controlled_execution): Allow finish
to return to the call.
* gdb.mi/mi2-simplerun.exp (test_controlled_execution): Likewise.
* gdb.mi/mi-return.exp (test_return_simple): Likewise.
* gdb.mi/mi2-return.exp (test_return_simple): Likewise.
* gdb.mi/mi-until.exp (test_until): Likewise.
* gdb.mi/mi2-until.exp (test_until): Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.cp')
| -rw-r--r-- | gdb/testsuite/gdb.cp/classes.exp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp index 60c1632..79a88d8 100644 --- a/gdb/testsuite/gdb.cp/classes.exp +++ b/gdb/testsuite/gdb.cp/classes.exp @@ -581,7 +581,14 @@ proc do_tests {} { gdb_breakpoint enums2 gdb_test "continue" ".*Breakpoint .* enums2.*" "continue to enums2(\\(\\)|)" - gdb_test "finish" "" "" + # Leave enums2. Make sure we reach the next line, in case there + # are any more instructions to finish the function call. + gdb_test_multiple "finish" "" { + -re "enums2 \\(\\);.*$gdb_prompt $" { + gdb_test "next" "" "" + } + -re "$gdb_prompt $" { } + } test_enums gdb_test "finish" "" "" |