From e075690553ca54b3ad15e9ebc643cdc879c341a9 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 18 Jun 2010 16:51:10 +0000 Subject: [PATCH] * gdb.base/gdb11531.exp: Respect gdb,no_hardware_watchpoints flag. * gdb.base/watch-cond.exp: Likewise. * gdb.python/py-breakpoint.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/gdb11531.exp | 4 ++++ gdb/testsuite/gdb.base/watch-cond.exp | 15 +++++++++++++++ gdb/testsuite/gdb.python/py-breakpoint.exp | 5 +++++ 4 files changed, 30 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f647c56..d789a41 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-06-18 Ulrich Weigand + + * gdb.base/gdb11531.exp: Respect gdb,no_hardware_watchpoints flag. + * gdb.base/watch-cond.exp: Likewise. + * gdb.python/py-breakpoint.exp: Likewise. + 2010-06-18 Pedro Alves * gdb.multi/base.exp, gdb.multi/bkpt-multi-exec.exp: Use diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp index e222036..00be25b 100644 --- a/gdb/testsuite/gdb.base/gdb11531.exp +++ b/gdb/testsuite/gdb.base/gdb11531.exp @@ -30,6 +30,10 @@ if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } { return -1; } +# Disable hardware watchpoints if necessary. +if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test_no_output "set can-use-hw-watchpoints 0" "" +} if { ![runto main] } then { fail "run to main" diff --git a/gdb/testsuite/gdb.base/watch-cond.exp b/gdb/testsuite/gdb.base/watch-cond.exp index b79edc2..0273e4b 100644 --- a/gdb/testsuite/gdb.base/watch-cond.exp +++ b/gdb/testsuite/gdb.base/watch-cond.exp @@ -26,6 +26,11 @@ if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { return -1 } +# Disable hardware watchpoints if necessary. +if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test_no_output "set can-use-hw-watchpoints 0" "" +} + if ![runto_main] then { fail "Can't run to main" return @@ -41,6 +46,11 @@ gdb_test "continue" \ clean_restart ${testfile} +# Disable hardware watchpoints if necessary. +if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test_no_output "set can-use-hw-watchpoints 0" "" +} + if ![runto_main] then { fail "Can't run to main" return @@ -56,6 +66,11 @@ gdb_test "continue" \ clean_restart ${testfile} +# Disable hardware watchpoints if necessary. +if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test_no_output "set can-use-hw-watchpoints 0" "" +} + if ![runto_main] then { fail "Can't run to main" return diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp index d5e259f..07a7362 100644 --- a/gdb/testsuite/gdb.python/py-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-breakpoint.exp @@ -130,6 +130,11 @@ gdb_test "python print blist\[len(blist)-1\].commands" "print \"Command for brea # Start with a fresh gdb. clean_restart ${testfile} +# Disable hardware watchpoints if necessary. +if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test_no_output "set can-use-hw-watchpoints 0" "" +} + if ![runto_main] then { fail "Cannot run to main." return 0 -- 2.7.4