* gdb.python/py-breakpoint.exp: Re-set can-use-hw-watchpoints

	flag after restarting GDB if necessary.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e66e89a..c7e60d7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2011-07-22  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
+       * gdb.python/py-breakpoint.exp: Re-set can-use-hw-watchpoints
+       flag after restarting GDB if necessary.
+
+2011-07-22  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
        * gdb.python/py-shared.exp: Call gdb_load_shlibs.
 
 2011-07-22  Pedro Alves  <pedro@codesourcery.com>

diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index f0a83f1..e0dd087 100644 (file)
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -186,6 +186,10 @@ gdb_test "continue" ".*\[Ww\]atchpoint.*result.*Old value = 0.*New value = 25.*m
 # 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
@@ -201,6 +205,10 @@ gdb_test "continue" ".*\[Ww\]atchpoint.*result.*Old value = 0.*New value = 25.*"
 # 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