diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.reverse/step-precsave.exp | 21 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.reverse/step-reverse.exp | 21 |
3 files changed, 33 insertions, 16 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 249cbc0..5866051 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2016-04-22 Yao Qi <yao.qi@linaro.org> + * gdb.reverse/step-precsave.exp: Do one step and test program + stops in "callee" and do multiple steps until program goes out + of "callee". + * gdb.reverse/step-reverse.exp: Likewise. + +2016-04-22 Yao Qi <yao.qi@linaro.org> + * gdb.trace/signal.exp: Also pass if $tracepoint_hits($i) > $iterations. diff --git a/gdb/testsuite/gdb.reverse/step-precsave.exp b/gdb/testsuite/gdb.reverse/step-precsave.exp index a15bc2d..92574b6 100644 --- a/gdb/testsuite/gdb.reverse/step-precsave.exp +++ b/gdb/testsuite/gdb.reverse/step-precsave.exp @@ -240,21 +240,26 @@ gdb_test_multiple "stepi" "$test_message" { # step backward into function (thru return) -set test_message "reverse step into fn call" +gdb_test "step" "(RETURN FROM CALLEE|ARRIVED IN CALLEE).*" \ + "reverse step into fn call" + +# step backward out of called function (thru call) + +set test_message "reverse step out of called fn" gdb_test_multiple "step" "$test_message" { - -re "RETURN FROM CALLEE.*$gdb_prompt $" { + -re "STEP INTO THIS CALL.*.*$gdb_prompt $" { + pass "$test_message" + } + -re "ARRIVED IN CALLEE.*$gdb_prompt $" { send_gdb "step\n" exp_continue } - -re "ARRIVED IN CALLEE.*$gdb_prompt $" { - pass "$test_message" + -re "ENTER CALLEE.*$gdb_prompt $" { + send_gdb "step\n" + exp_continue } } -# step backward out of called function (thru call) - -gdb_test "step" ".*STEP INTO THIS CALL.*" "reverse step out of called fn" - # next backward over call gdb_test "next" ".*NEXT OVER THIS CALL.*" "reverse next over call" diff --git a/gdb/testsuite/gdb.reverse/step-reverse.exp b/gdb/testsuite/gdb.reverse/step-reverse.exp index fbf41e8..6f1e8b6 100644 --- a/gdb/testsuite/gdb.reverse/step-reverse.exp +++ b/gdb/testsuite/gdb.reverse/step-reverse.exp @@ -213,21 +213,26 @@ gdb_test_multiple "stepi" "$test_message" { # step backward into function (thru return) -set test_message "reverse step into fn call" +gdb_test "step" "(RETURN FROM CALLEE|ARRIVED IN CALLEE).*" \ + "reverse step into fn call" + +# step backward out of called function (thru call) + +set test_message "reverse step out of called fn" gdb_test_multiple "step" "$test_message" { - -re "RETURN FROM CALLEE.*$gdb_prompt $" { + -re "STEP INTO THIS CALL.*.*$gdb_prompt $" { + pass "$test_message" + } + -re "ARRIVED IN CALLEE.*$gdb_prompt $" { send_gdb "step\n" exp_continue } - -re "ARRIVED IN CALLEE.*$gdb_prompt $" { - pass "$test_message" + -re "ENTER CALLEE.*$gdb_prompt $" { + send_gdb "step\n" + exp_continue } } -# step backward out of called function (thru call) - -gdb_test "step" ".*STEP INTO THIS CALL.*" "reverse step out of called fn" - # next backward over call gdb_test "next" ".*NEXT OVER THIS CALL.*" "reverse next over call" |