diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/float.exp | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/step-test.exp | 5 |
4 files changed, 24 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 83acdb3..ee51ef7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-05-08 Daniel Jacobowitz <dan@codesourcery.com> + + * gdb.base/commands.exp (watchpoint_command_test): Handle + gdb,no_hardware_watchpoints. + * gdb.base/float.exp: Allow ARM targets without floating point. + * gdb.base/step-test.exp: Allow callee@plt when stepping in. + 2008-05-06 Jerome Guitton <guitton@adacore.com> Joel Brobecker <brobecker@adacore.com> diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 31767ee..6347b0b 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -274,6 +274,11 @@ proc watchpoint_command_test {} { return } + # Disable hardware watchpoints if necessary. + if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test "set can-use-hw-watchpoints 0" "" "" + } + gdb_test "set args 6" "" "set args in watchpoint_command_test" if { ![runto factorial] } then { return } delete_breakpoints diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp index e0f0d9f..e0308eb 100644 --- a/gdb/testsuite/gdb.base/float.exp +++ b/gdb/testsuite/gdb.base/float.exp @@ -56,7 +56,14 @@ if { [istarget "alpha*-*-*"] } then { } elseif { [istarget "arm*-*-*"] || \ [istarget "xscale*-*-*"] || \ [istarget "strongarm*-*-*"] } then { - gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float" + gdb_test_multiple "info float" "info float" { + -re "Software FPU type.*mask:.*flags:.*$gdb_prompt $" { + pass "info float (FPA)" + } + -re "No floating.point info available for this processor.*" { + pass "info float (without FPU)" + } + } } elseif { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } then { gdb_test "info float" "R7:.*Status Word:.*Opcode:.*" "info float" } elseif [istarget "ia64-*-*"] then { diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp index 49bc45e..3710bbe 100644 --- a/gdb/testsuite/gdb.base/step-test.exp +++ b/gdb/testsuite/gdb.base/step-test.exp @@ -128,8 +128,11 @@ proc test_i {name command here there} { test_i "stepi to next line" "stepi" \ ".*${decimal}.*a.*5.* = a.*3" \ ".*${decimal}.*callee.*STEPI" + +# Continue to step until we enter the function. Also keep stepping +# if this passes through a (useless) PLT entry. test_i "stepi into function" "stepi" \ - ".*${decimal}.*callee.*STEPI" \ + "(.*${decimal}.*callee.*STEPI|.* in callee@plt)" \ ".*callee \\(\\) at .*step-test\\.c" # Continue to step until we reach the function's body. This makes it |