Merge GDB 7.5.1

gdb/testsuite/gdb.cp/method.exp

 # Copyright 1998-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
@@ skipping 11 matching lines @@
 # This tests:
 # 0. method arguments are correct
 # 1. access to class data members inside method scopes
 # 2. correct param types for methods in ptype.
 # 3. const and volatile methods
 
 # (#0 and #1 above relate to an HP specific problem -- GDB must correctly
 # integrate FPARAM symbols in HP debug info into the local var list
 # for the function or method's block.)
 
-if $tracelevel then {
-        strace $tracelevel
-        }
-
 #
 # test running programs
 #
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "method"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested method.exp
-     return -1
-}
-
-if [get_compiler_info $binfile "c++"] {
+if [get_compiler_info "c++"] {
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
+}
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
     continue
 }
 
 gdb_test "break A::foo" \
@@ skipping 106 matching lines @@
 
 gdb_test_multiple "cont" "finish program" {
     -re "Continuing.\r\n$inferior_exited_re normally.*$gdb_prompt $" {
         pass "finish program"
     }
     -re "Continuing.* EXIT code 0.*$inferior_exited_re normally.*$gdb_prompt $" {
         pass "finish program (exit wrapper)" 
     }
 }