From bb3912236d517f154ab93377fe746d88149bfa88 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 16 Feb 2010 21:20:14 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.arch/thumb2-it.exp (test_it_break): Handle hardware single-stepping. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.arch/thumb2-it.exp | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4f0e069a631..cbe4e77a372 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-02-16 Daniel Jacobowitz + + * gdb.arch/thumb2-it.exp (test_it_break): Handle hardware + single-stepping. + 2010-02-16 Daniel Jacobowitz * gdb.python/py-value.exp (test_value_in_inferior): Skip arg0 test diff --git a/gdb/testsuite/gdb.arch/thumb2-it.exp b/gdb/testsuite/gdb.arch/thumb2-it.exp index 5144ac16f2a..8c29fe8f095 100644 --- a/gdb/testsuite/gdb.arch/thumb2-it.exp +++ b/gdb/testsuite/gdb.arch/thumb2-it.exp @@ -126,6 +126,8 @@ proc test_it_block { func } { } proc test_it_break { ndx } { + global software_step + set line [gdb_get_line_number "@ Break ${ndx}"] if { ! [gdb_breakpoint "${line}"] } { @@ -133,7 +135,11 @@ proc test_it_break { ndx } { return } - gdb_continue_to_breakpoint "test ${ndx}" ".*@ Location ${ndx}.*" + if { $software_step } { + gdb_continue_to_breakpoint "test ${ndx}" ".*@ Location ${ndx}.*" + } else { + gdb_continue_to_breakpoint "test ${ndx}" ".*@ Break ${ndx}.*" + } } # If we are using software single-stepping in GDB, then GDB will not -- 2.30.2