Merge GDB 7.5.1

gdb/testsuite/gdb.cp/nsimport.exp

Index: gdb/testsuite/gdb.cp/nsimport.exp
diff --git a/gdb/testsuite/gdb.cp/nsimport.exp b/gdb/testsuite/gdb.cp/nsimport.exp
index deeca460748101a27f1122b796803cc9aa7cdb46..4547d26ce798fb43385ec55cdb860decd0661828 100644
--- a/gdb/testsuite/gdb.cp/nsimport.exp
+++ b/gdb/testsuite/gdb.cp/nsimport.exp
@@ -16,26 +16,13 @@
 # Test printing from multiple namespace
 # imported into the same scope.
 
-if $tracelevel then {
-    strace $tracelevel
-}
 
+standard_testfile .cc
 
-set testfile nsimport
-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 {[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}
-
 ############################################
 # test printing of namespace imported within
 # the function.