Merge GDB 7.5.1

gdb/testsuite/gdb.cp/dispcxx.exp

Index: gdb/testsuite/gdb.cp/dispcxx.exp
diff --git a/gdb/testsuite/gdb.cp/pr12028.exp b/gdb/testsuite/gdb.cp/dispcxx.exp
similarity index 58%
copy from gdb/testsuite/gdb.cp/pr12028.exp
copy to gdb/testsuite/gdb.cp/dispcxx.exp
index 2c3b406980db2e7f1631fd6c6bfcf8a871df55e8..417450467acaee8ace4651f2f16a00f4325fba94 100644
--- a/gdb/testsuite/gdb.cp/pr12028.exp
+++ b/gdb/testsuite/gdb.cp/dispcxx.exp
@@ -1,4 +1,4 @@
-# Copyright 2008, 2011-2012 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,17 +13,27 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile pr12028
-set srcfile ${testfile}.cc
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } {
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile .cc
+
+if [get_compiler_info "c++"] {
+    untested dispcxx.exp
     return -1
 }
 
-############################################
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
+}
 
 if ![runto_main] then {
-    perror "couldn't run to breakpoint main"
+    perror "couldn't run to main"
     continue
-}
+} 
+
+gdb_breakpoint [gdb_get_line_number "Break here"]
+gdb_continue_to_breakpoint here
 
-gdb_test "p D::foo(b)" "Cannot resolve function foo to any overloaded instance"
+# Regression test for
+# http://sourceware.org/bugzilla/show_bug.cgi?id=9307.
+gdb_test "display k" "1: k = 23"