diff options
| author | emachado <emachado> | 2011-05-02 17:07:10 +0000 |
|---|---|---|
| committer | emachado <emachado> | 2011-05-02 17:07:10 +0000 |
| commit | 6dedabb79b8c5326fb38bd6650ba2e56435e799b (patch) | |
| tree | c68ee44bb480066443e573274dc61a11c8bb336c /gdb/testsuite/gdb.opt | |
| parent | 9624c5b5f8087c2b72d73e5413069500162f5dfd (diff) | |
| download | gdb-6dedabb79b8c5326fb38bd6650ba2e56435e799b.tar.gz | |
* gdb.opt/inline-cmds.exp: Adjust checks with "finish" command to
accept to show the caller line again as well as the line after.
Diffstat (limited to 'gdb/testsuite/gdb.opt')
| -rw-r--r-- | gdb/testsuite/gdb.opt/inline-cmds.exp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp index cde86f51c05..cb5f96f44f8 100644 --- a/gdb/testsuite/gdb.opt/inline-cmds.exp +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp @@ -263,7 +263,20 @@ gdb_continue_to_breakpoint "finish into func1" gdb_test "next" ".*marker \\\(\\\);" "next to finish marker" gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker" -gdb_test "finish" "func1 \\\(\\\);" "finish from marker to func1" + +# Some architectures will have one or more instructions after +# the call instruction which still are part of the call sequence, +# so it should be expected to return to the caller line after issue +# a 'finish' command. +gdb_test_multiple "finish" "finish from marker" { + -re "func1 \\\(\\\);.*\r\n$gdb_prompt $" { + pass "finish from marker to func1" + } + -re "marker \\\(\\\);.*\r\n$gdb_prompt $" { + pass "finish from marker" + gdb_test "step" "func1 \\\(\\\);.*" "step after marker to reach func1" + } +} gdb_test "step" "bar \\\(\\\);" "step into func1 for finish" gdb_test "finish" "func3 \\\(\\\);" "finish from func1 to func3" @@ -273,7 +286,15 @@ set line6 [gdb_get_line_number "set breakpoint 6 here"] gdb_breakpoint $line6 gdb_continue_to_breakpoint "before the outer_inline call" gdb_test "step" "marker \\\(\\\) at .*" "reach 1 the outer_inline call" -gdb_test "finish" "main \\\(\\\) at .*outer_inline2 \\\(\\\);" "reach outer_inline2" +gdb_test_multiple "finish" "finish from marker" { + -re "main \\\(\\\) at .*outer_inline2 \\\(\\\);.*\r\n$gdb_prompt $" { + pass "reach outer_inline2" + } + -re "main \\\(\\\) at .*marker \\\(\\\);.*\r\n$gdb_prompt $" { + pass "finish from marker" + gdb_test "step" "outer_inline2 \\\(\\\);.*" "step after marker to reach outer_inline2" + } +} gdb_test "bt" "#0 main.*" "backtrace at main of outer_inline" gdb_test "step" "outer_inline2 \\\(\\\) at .*" "enter outer_inline2" gdb_test "bt" "#0 outer_inline2.*#1 main.*" "backtrace at outer_inline2" |