Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp

 # Copyright 2011-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/>.
 
 if { [skip_cplus_tests] } { continue }
 
 load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-set testfile mi-inheritance-syntax-error
-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 mi-inheritance-syntax-error.exp
   return -1
 }
 
 # Test that children of derived classes are given the proper
 # path by -var-info-path-expression
@@ skipping 22 matching lines @@
 verbose "var-info-path-expression returned $cmd_output" 2
 verbose "Using $path for data-evaluate-expression" 2
 
 
 mi_gdb_test "-data-evaluate-expression \"$path\"" \
     "\\^done,value=\"\{a = 5\}\"" \
     "-data-evaluate-expression $path"
 
 mi_gdb_exit
 return 0