aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.mi/mi-simplerun.exp
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2007-10-02 14:57:46 +0000
committerDaniel Jacobowitz <drow@false.org>2007-10-02 14:57:46 +0000
commit471ba8c90c7a40273fabd5821b1a10125463f3fa (patch)
tree0d42b90c7595bf96b188281833c20a36381f87ae /gdb/testsuite/gdb.mi/mi-simplerun.exp
parente42e4a8b9ea03a49d9a323c8dafaa074815e76aa (diff)
downloadgdb-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.mi/mi-simplerun.exp')
-rw-r--r--gdb/testsuite/gdb.mi/mi-simplerun.exp4
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index 86eaf5f..d4f3409 100644
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -130,6 +130,7 @@ proc test_controlled_execution {} {
set line_callee4_head [gdb_get_line_number "callee4 ("]
set line_callee4_body [expr $line_callee4_head + 2]
set line_callee3_head [gdb_get_line_number "callee3 ("]
+ set line_callee3_call [expr $line_callee3_head + 2]
set line_callee3_close_brace [expr $line_callee3_head + 3]
set line_callee1_head [gdb_get_line_number "callee1 ("]
set line_callee1_body [expr $line_callee1_head + 2]
@@ -162,7 +163,8 @@ proc test_controlled_execution {} {
# FIXME: A string argument is not printed right; should be fixed and
# we should look for the right thing here.
# NOTE: The ``.'' is part of ``gdb-result-var="$1"''
- mi_finish_to "callee3" ".*" "basics.c" $line_callee3_close_brace ".1" "0" "exec-finish"
+ mi_finish_to "callee3" ".*" "basics.c" \
+ "($line_callee3_call|$line_callee3_close_brace)" ".1" "0" "exec-finish"
}
proc test_controlling_breakpoints {} {