From: Pedro Alves <palves@redhat.com>
Date: Fri, 27 Jan 2012 13:55:58 +0000 (+0000)
Subject: 2012-01-27  Pedro Alves  <palves@redhat.com>
X-Git-Tag: sid-snapshot-20120201~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3ad2025d78032c917c93d8eb38d88bbf4294408;p=thirdparty%2Fbinutils-gdb.git

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 ed36c8eaad8..ad10adfb2e5 100644
--- 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 16fe05f348f..9aeb5ec3001 100644
--- 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