GDB 7.6.50

gdb/testsuite/gdb.base/recurse.exp

Index: gdb/testsuite/gdb.base/recurse.exp
diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp
index cbc98710857b419681c6255803fc18f95c321340..7155808c93c6cf59096a4d33e42da60ddc4bce7f 100644
--- a/gdb/testsuite/gdb.base/recurse.exp
+++ b/gdb/testsuite/gdb.base/recurse.exp
@@ -1,5 +1,4 @@
-# Copyright 1992, 1994-1997, 1999-2000, 2007-2012 Free Software
-# Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,20 +16,12 @@
 # This file was written by Jeff Law. (law@cs.utah.edu)
 
 
-set testfile "recurse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested recurse.exp
-     return -1
-}
-
-# Start with a fresh gdb.
+standard_testfile
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
+    untested $testfile.exp
+    return -1
+}
 
 proc recurse_tests {} {
 
@@ -50,7 +41,7 @@ proc recurse_tests {} {
 	if [gdb_test "continue" \
 	    "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 10.*" \
 	    "continue to first instance watchpoint, first time"] then {
-	    gdb_suppress_tests;
+	    gdb_suppress_tests
 	}
 
 	# Continue inward for a few iterations
@@ -76,7 +67,7 @@ proc recurse_tests {} {
 	if [gdb_test "continue" \
 	    "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 5.*"\
 	    "continue to second instance watchpoint, first time"] then {
-	gdb_suppress_tests;
+	gdb_suppress_tests
 	}
 
 	# Continue inward for a few iterations
@@ -93,14 +84,14 @@ proc recurse_tests {} {
 	if [gdb_test "continue" \
 	    "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 5.*New value = 120.*return.*" \
 	    "continue to second instance watchpoint, second time"] then { 
-	    gdb_suppress_tests;
+	    gdb_suppress_tests
 	}
 
 	# Continue again.  We should have a watchpoint go out of scope now
 	if [gdb_test "continue" \
 	    "Continuing.*\[Ww\]atchpoint.*deleted.*recurse \\(a=6\\) .*" \
 	    "second instance watchpoint deleted when leaving scope"] then {
-	    gdb_suppress_tests;
+	    gdb_suppress_tests
 	}
 
 	# Continue until second set of b (first instance).
@@ -139,10 +130,10 @@ proc recurse_tests {} {
 	if [gdb_test "continue" \
 	    "Continuing.*\[Ww\]atchpoint.*deleted.*\(main \\(\\) \|21.*\}\).*" \
 	    "first instance watchpoint deleted when leaving scope"] then {
-	    gdb_suppress_tests;
+	    gdb_suppress_tests
 	}
     }
-    gdb_stop_suppressing_tests;
+    gdb_stop_suppressing_tests
 }
 
 # Preserve the old timeout, and set a new one that should be