Merge GDB 7.5.1

gdb/testsuite/gdb.cp/exception.exp

Index: gdb/testsuite/gdb.cp/exception.exp
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 5cff73ba2216827602d19a3ee7ae0fd8e7ecbc08..ae2d8b45a1546d767eaba4c852c7f7a132f8b83e 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -34,10 +34,6 @@
 set ws	"\[\r\n\t \]+"
 set nl	"\[\r\n\]+"
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 if { [skip_stl_tests] } { continue }
 
 # On SPU this test fails because the executable exceeds local storage size.
@@ -45,23 +41,12 @@ if { [istarget "spu*-*-*"] } {
         return 0
 }
 
-set testfile "exception"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
  
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested exception.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
-# Start with a fresh gdb
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Set a catch catchpoint
 
 gdb_test "catch catch" "Catchpoint \[0-9\]+ \\(catch\\)" \