Merge GDB 7.5.1

gdb/testsuite/gdb.fortran/charset.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/>.
 
 # This file is part of the gdb testsuite.  It contains tests for evaluating
 # Fortran subarray expression.
 
 if { [skip_fortran_tests] } { return -1 }
 
-set testfile "charset"
-set srcfile ${testfile}.f90
+standard_testfile .f90
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug additional_flags=-fbackslash f90}] } {
     return -1
 }
 
 if ![runto MAIN__] {
     perror "Couldn't run to MAIN__"
     continue
 }
 
 gdb_breakpoint [gdb_get_line_number "break-here"]
 gdb_continue_to_breakpoint "break-here"
 
 gdb_test "print x" \
     " = 'j'" \
     "print fortran narrow character"
 
 gdb_test "print c" \
     " = 4_'k'" \
     "print fortran wide character"
 
 gdb_test "print str" \
     " = 4_'lmnop'" \
     "print fortran wide string"