Merge GDB 7.5.1

gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp

Index: gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp
diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp
index 226d0b802ed20a2b108e8581811b6cad1782fa03..01c56f1cc8b00f2fef5280e78e3bcb265b978c51 100644
--- a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp
+++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp
@@ -16,10 +16,8 @@
 #
 # This file is part of the gdb testsuite.
 
-set testfile expand-psymtabs-cxx
-set srcfile ${testfile}.cc
-set executable ${testfile}.x
-set binfile ${objdir}/${subdir}/${executable}
+standard_testfile .cc
+set executable ${testfile}
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug c++} ] != "" } {
      untested ${testfile}.exp
@@ -32,6 +30,9 @@ gdb_test_no_output "set language c++"
 
 # FAIL was:
 # $1 = {<text variable, no debug info>} 0
-gdb_test "p 'method(long)'" { = {void \(long\)} 0} "before expand"
-gdb_test "p method" { = {void \(long\)} 0} "force expand"
-gdb_test "p 'method(long)'" { = {void \(long\)} 0} "after expand"
+gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 <method.long.>} \
+    "before expand"
+gdb_test "p method" { = {void \(long\)} 0x0 <method.long.>} \
+    "force expand"
+gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 <method.long.>} \
+    "after expand"