gdb/testsuite/

	* gdb.arch/thumb2-it.exp (test_it_break): Handle hardware
	single-stepping.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4f0e069a631504c304b3542de1876df0af970a22..cbe4e77a372a11334aba6b586a5859656d104300 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.arch/thumb2-it.exp (test_it_break): Handle hardware
+       single-stepping.
+
 2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * 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 5144ac16f2a1086e94fd65a03cd07666bb9f411a..8c29fe8f095f674591708e3fdc2869f6af580661 100644 (file)
--- 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