From 471ba8c90c7a40273fabd5821b1a10125463f3fa Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 2 Oct 2007 14:57:46 +0000 Subject: * 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. --- gdb/testsuite/gdb.cp/classes.exp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gdb/testsuite/gdb.cp/classes.exp') 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" "" "" -- cgit v1.1