Merge GDB 7.5.1

gdb/testsuite/gdb.cp/cplusfuncs.exp

 # Copyright 1992, 1997, 1999, 2001-2004, 2007-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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Fred Fish. (fnf@cygnus.com)
 # Adapted for g++ 3.0 ABI by Michael Chastain. (chastain@redhat.com)
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 if { [skip_cplus_tests] } { continue }
 
-set testfile "cplusfuncs"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if { [get_compiler_info $binfile "c++"] } {
+if { [get_compiler_info "c++"] } {
     return -1
 }
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested cplusfuncs.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
 #
 # g++ changed its ABI between 2.95 and 3.0.  gdb has two demanglers
 # for the two different styles.  The two demanglers have some subtle
 # discrepancies in their output.
 #
 #   old demangler         new demangler
 #   --- ---------         --- ---------
 #   "operator, "          "operator,"
@@ skipping 534 matching lines @@
 
         # gdb-gnats bug gdb/19:
         # "gdb v3 demangler fails on hairyfunc5 hairyfunc6 hairyfunc7"
         print_addr_2 "hairyfunc5" "hairyfunc5(PFPc_PFl_i)"
         print_addr_2 "hairyfunc6" "hairyfunc6(PFPi_PFl_i)"
         print_addr_2 "hairyfunc7" "hairyfunc7(PFPFPc_i_PFl_i)"
     }
 }
 
 proc do_tests {} {
-    global subdir
-    global objdir
-    global srcdir
     global binfile
-    global gdb_prompt
     global dm_type_int_star
 
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
+    clean_restart $binfile
 
     gdb_test_no_output "set width 0"
 
     runto_main
 
     gdb_test_no_output "set language c++"
     probe_demangler
     test_paddr_overloaded_functions
     test_paddr_operator_functions
     test_paddr_hairy_functions
     test_lookup_operator_functions
 
     # A regression test on errors involving operators
     gdb_test "list foo::operator $dm_type_int_star" \
         "Function \"foo::operator [string_to_regexp $dm_type_int_star]\" not defined\\."
 }
 
 do_tests