Merge GDB 7.5.1

gdb/testsuite/gdb.cp/cpexprs.exp

 # cpexprs.exp - C++ expressions tests
 #
 # Copyright 2008-2012 Free Software Foundation, Inc.
 #
 # Contributed by Red Hat, originally written by Keith Seitz.
 #
 # 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
@@ skipping 645 matching lines @@
 add {policyd<tclass<int>, operation_1<tclass<int> > >::function} \
     {void (void)} \
     {operation_1<tclass<int> >::function} \
     {operation_1<T>::function}
 add {policyd5::function} \
     {void (void)} \
     {operation_1<tclass<int> >::function} \
     {operation_1<T>::function}
 
 # Start the test
-if {$tracelevel} {
-    strace $tracelevel
-}
-
 if {[skip_cplus_tests]} { continue }
 
 # On SPU this test fails because the executable exceeds local storage size.
 if { [istarget "spu*-*-*"] } {
         return 0
 }
 
 #
 # test running programs
 #
 
-set testfile "cpexprs"
-set srcfile "${testfile}.cc"
-set binfile [file join $objdir $subdir $testfile]
+standard_testfile .cc
 
-if  {[gdb_compile [file join $srcdir $subdir $srcfile] $binfile \
-          executable {debug c++}] != "" } {
-    untested "$testfile.exp"
+if {[get_compiler_info "c++"]} {
     return -1
 }
 
-if {[get_compiler_info $binfile "c++"]} {
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir [file join $srcdir $subdir]
-gdb_load $binfile
-
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
     continue
 }
 
 # Set the listsize to one. This will help with testing "list".
 gdb_test "set listsize 1"
 
 # "print METHOD"
 foreach name [get_functions print] {
     gdb_test "print $name" [get $name print] "print $name"
 }
 
 # "list METHOD"
 foreach name [get_functions list] {
     gdb_test "list $name" [get $name list] "list $name"
 }
 
 # Running to breakpoint -- use any function we can "list"
 foreach name [get_functions list] {
     # Skip "test_function", since test_breakpoint uses it
     if {[string compare $name "test_function"] != 0} {
         test_breakpoint $name
     }
 }
 
+# Test c/v gets recognized even without quoting.
+foreach cv {{} { const} { volatile} { const volatile}} {
+  set test "p 'CV::m(int)$cv'"
+  gdb_test_multiple $test $test {
+      -re "( = {.*} 0x\[0-9a-f\]+ <CV::m.*>)\r\n$gdb_prompt $" {
+          # = {void (CV * const, CV::t)} 0x400944 <CV::m(int)>
+          set correct $expect_out(1,string)
+          pass $test
+      }
+  }
+  if {"$cv" != ""} {
+      setup_kfail c++/14186 *-*-*
+  }
+  gdb_test "p CV::m(int)$cv" [string_to_regexp $correct]
+}
+
+# Test TYPENAME:: gets recognized even in parentheses.
+gdb_test "p CV_f(int)"   { = {int \(int\)} 0x[0-9a-f]+ <CV_f\(int\)>}
+gdb_test "p CV_f(CV::t)" { = {int \(int\)} 0x[0-9a-f]+ <CV_f\(int\)>}
+gdb_test "p CV_f(CV::i)" " = 43"
+
 gdb_exit
 return 0