diff options
-rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.opt/solib-intra-step.exp | 26 |
2 files changed, 6 insertions, 24 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 73bbd00..842f9a5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2021-01-29 Tom de Vries <tdevries@suse.de> + + * gdb.opt/solib-intra-step.exp: Remove state tracking logic. + 2021-01-28 Tom de Vries <tdevries@suse.de> * gdb.arch/i386-gnu-cfi.exp: Capture the position of function gate diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp index ad19895..527b58c 100644 --- a/gdb/testsuite/gdb.opt/solib-intra-step.exp +++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp @@ -48,52 +48,30 @@ if ![runto_main] then { } set test "first-hit" -set state 0 gdb_test_multiple "step" $test { -re -wrap " first-hit .*" { - gdb_assert { $state != -1 } $test + pass $gdb_test_name } -re -wrap " first-retry .*" { - if { $state != 0 } { - set state -1 - } else { - set state 1 - } send_gdb "step\n" exp_continue } -re -wrap "get_pc_thunk.*" { - if { $state != 1 } { - set state -1 - } else { - set state 2 - } send_gdb "step\n" exp_continue } } set test "second-hit" -set state 0 gdb_test_multiple "step" $test { -re -wrap " second-hit .*" { - gdb_assert { $state != -1 } $test + pass $gdb_test_name } -re -wrap " second-retry .*" { - if { $state != 0 } { - set state -1 - } else { - set state 1 - } send_gdb "step\n" exp_continue } -re -wrap "get_pc_thunk.*" { - if { $state != 1 } { - set state -1 - } else { - set state 2 - } send_gdb "step\n" exp_continue } |