Merge GDB 7.5.1

gdb/testsuite/gdb.cp/annota2.exp

Index: gdb/testsuite/gdb.cp/annota2.exp
diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 9de83c86f73493995e346b9e758da92a73fe4ab3..9a54face335ef57f6b82b60b636b0611227b07a1 100644
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -15,10 +15,6 @@
 
 # This file was written by Elena Zannoni (ezannoni@cygnus.com)
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 #
 # test running programs
@@ -26,12 +22,10 @@ if $tracelevel then {
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "annota2"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ nowarnings}] != "" } {
-    untested annota2.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+	 {debug c++ nowarnings}]} {
     return -1
 }
 
@@ -44,16 +38,6 @@ if [is_remote target] then {
     return 0
 }
 
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
 #
 # line number where we need to stop in main
 #