Merge GDB 7.5.1

gdb/testsuite/gdb.cp/shadow.exp

Index: gdb/testsuite/gdb.cp/shadow.exp
diff --git a/gdb/testsuite/gdb.cp/shadow.exp b/gdb/testsuite/gdb.cp/shadow.exp
index a6b40d1c586416c55a8d0c251f17bdec11a3bf46..76530e0cf39e4f370c343f8ac22f50a26df9a514 100644
--- a/gdb/testsuite/gdb.cp/shadow.exp
+++ b/gdb/testsuite/gdb.cp/shadow.exp
@@ -16,30 +16,17 @@
 # Test that when multiple variables have the same
 # name the one from the correct scope is printed.
 
-if $tracelevel then {
-    strace $tracelevel
-}
 
+standard_testfile .cc
 
-set testfile shadow
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    untested "Couldn't compile test program"
+if [get_compiler_info] {
     return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if ![runto_main] then {
     perror "couldn't run to breakpoint main"
     continue