Merge GDB 7.5.1

gdb/testsuite/gdb.cp/formatted-ref.exp

Index: gdb/testsuite/gdb.cp/formatted-ref.exp
diff --git a/gdb/testsuite/gdb.cp/formatted-ref.exp b/gdb/testsuite/gdb.cp/formatted-ref.exp
index 34cb7c5e5d787db783f2be9c6c2fa6a10b5067f3..4522a299386c9acdd7a925e9a0aac5d9cfc728dd 100644
--- a/gdb/testsuite/gdb.cp/formatted-ref.exp
+++ b/gdb/testsuite/gdb.cp/formatted-ref.exp
@@ -27,20 +27,13 @@
 # work properly: condition expression using a reference object as one of its
 # operand.
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "formatted-ref"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested formatted-ref.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
 proc get_address { var } {
@@ -117,11 +110,6 @@ proc test_p_op1_equals_op2 {op1 op2} {
     gdb_test $test "\\$\[0-9\]+ = true"
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto ${srcfile}:[gdb_get_line_number "marker here"]
 
 set s1_address  [get_address "s1"]