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

	* gdb.base/watchpoint.exp: Clean restart after tests that don't
	require `initialize' anymore.  Remove unnecessary `initialize'
	calls.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ed36c8eaad80856b806431186ad0ece168f50907..ad10adfb2e5bc966ea1c3cd177548f1b72d2b6b7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-27  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/watchpoint.exp: Clean restart after tests that don't
+       require `initialize' anymore.  Remove unnecessary `initialize'
+       calls.
+
 2012-01-27  Pedro Alves  <palves@redhat.com>
 
        * gdb.base/watchpoint.exp (wp_set): Delete.

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 16fe05f348f2b78dbac713c3c7b7d613da8422eb..9aeb5ec30015398698ae07b15c89991f60db71b5 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -781,17 +781,12 @@ if [initialize] then {
 
     if ![target_info exists gdb,cannot_call_functions] {
        test_stepping
-
-       # See above.
-       if [istarget "mips-idt-*"] then {
-           gdb_exit
-           gdb_start
-           gdb_reinitialize_dir $srcdir/$subdir
-           gdb_load $binfile
-           initialize
-       }
     }
 
+    # Tests below don't rely on the markers and watchpoint set by
+    # `initialize' anymore.
+    clean_restart $testfile
+
     # Only enabled for some targets merely because it has not been tested 
     # elsewhere.
     # On sparc-sun-sunos4.1.3, GDB was running all the way to the marker4 
@@ -806,7 +801,6 @@ if [initialize] then {
        gdb_start
        gdb_reinitialize_dir $srcdir/$subdir
        gdb_load $binfile
-       initialize
     }
 
     # Only enabled for some targets merely because it has not been tested 
@@ -852,7 +846,6 @@ if [initialize] then {
        gdb_start
        gdb_reinitialize_dir $srcdir/$subdir
        gdb_load $binfile
-       initialize
     }
 
     test_watchpoint_and_breakpoint