Merge GDB 7.5.1

gdb/testsuite/gdb.cp/pr9167.exp

Index: gdb/testsuite/gdb.cp/pr9167.exp
diff --git a/gdb/testsuite/gdb.cp/pr9167.exp b/gdb/testsuite/gdb.cp/pr9167.exp
index 0a99093e81158e69cc7d93fac3e3a8ece23d3c43..7c86b39e73f0d692d4eb91a675276d87e2d1cab6 100644
--- a/gdb/testsuite/gdb.cp/pr9167.exp
+++ b/gdb/testsuite/gdb.cp/pr9167.exp
@@ -18,9 +18,9 @@ if { [istarget "spu*-*-*"] } {
         return 0
 }
 
-set testfile pr9167
-set srcfile ${testfile}.cc
-if [prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}] {
+standard_testfile .cc
+
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }