2012-01-27 Pedro Alves <palves@redhat.com>

	* gdb.base/watchpoint.exp (top level): Re-enable hardware
	watchpoints sooner.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c32f46c..7f1776e 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2012-01-27  Pedro Alves  <palves@redhat.com>
 
+       * gdb.base/watchpoint.exp (top level): Re-enable hardware
+       watchpoints sooner.
+
+2012-01-27  Pedro Alves  <palves@redhat.com>
+
        * gdb.base/watchpoint.exp (top level): Delete watch ival3.
 
 2012-01-27  Pedro Alves  <palves@redhat.com>

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 6eba4b0..a3d5234 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -875,6 +875,11 @@ if [initialize] then {
        "Expression cannot be implemented with read/access watchpoint..*" \
        "rwatch disallowed when can-set-hw-watchpoints cleared"
 
+    # Re-enable hardware watchpoints if necessary.
+    if ![target_info exists gdb,no_hardware_watchpoints] {
+        gdb_test_no_output "set can-use-hw-watchpoints 1" ""
+    }
+
     test_watchpoint_and_breakpoint
 
     test_watchpoint_in_big_blob
@@ -885,11 +890,6 @@ if [initialize] then {
 
     test_watch_location
 
-    # Re-enable hardware watchpoints if necessary.
-    if ![target_info exists gdb,no_hardware_watchpoints] {
-        gdb_test_no_output "set can-use-hw-watchpoints 1" ""
-    }
-
     test_wide_location_1
     test_wide_location_2
 }