* gdb.base/gdb11531.exp: Respect gdb,no_hardware_watchpoints flag.

	* gdb.base/watch-cond.exp: Likewise.
	* gdb.python/py-breakpoint.exp: Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f647c5608fd4eae6b74019a7b5f98446872ac4a3..d789a4138b5b478494fb4062ab11b07e04e72af6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-18  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       * 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  <pedro@codesourcery.com>
 
        * 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 e222036541018570c3055bfd5b62ca7455b30643..00be25bd9d14ff24e62927404def96ae88c093ba 100644 (file)
--- 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 b79edc25674af2513321d5da417a52219daf9930..0273e4b686af4eef8de4da2d8a68f0523ec7b2eb 100644 (file)
--- 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 d5e259fa17deed7231c9dab16d087dab1f83fe72..07a7362f42ed56e89f1a42cce85390208dc0a102 100644 (file)
--- 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