Merge GDB 7.5.1

gdb/testsuite/gdb.cp/m-static.exp

Index: gdb/testsuite/gdb.cp/m-static.exp
diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
index 0b8f29032b42c957fc901b86aa717aa99d8b4126..0ac1d2eb0b7aa3e42bfe319bd3f0a5d1562e53c7 100644
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
@@ -19,47 +19,23 @@
 
 # This file is part of the gdb testsuite
 
-if $tracelevel then {
-        strace $tracelevel
-        }
-
 if { [skip_cplus_tests] } { continue }
 
 #
 # test running programs
 #
 
-set testfile "m-static"
-set srcfile  "${testfile}.cc"
-set srcfile1 "${testfile}1.cc"
-set objfile  "${testfile}.o"
-set objfile1 "${testfile}1.o"
-set binfile  "${objdir}/${subdir}/${testfile}"
-
-if  { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
-     untested m-static.exp
-     return -1
-}
-
-if  { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     untested m-static.exp
-     return -1
-}
+standard_testfile .cc m-static1.cc
 
-if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1" "${binfile}" executable {debug c++}] != "" } {
-     untested m-static.exp
-     return -1
+if [get_compiler_info] {
+    return -1
 }
 
-if [get_compiler_info $binfile] {
+if {[prepare_for_testing $testfile.exp $testfile \
+	 [list $srcfile $srcfile2] {debug c++}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
     continue