Merge GDB 7.5.1

gdb/testsuite/gdb.cp/temargs.exp

 # temargs.exp - Template argument tests
 #
 # Copyright 2010-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.
 
-if {$tracelevel} {
-    strace $tracelevel
-}
-
 if {[skip_cplus_tests]} {
     continue
 }
 
-set testfile "temargs"
-set srcfile "${testfile}.cc"
+standard_testfile .cc
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
 if {![runto_main]} {
     return -1
 }
 
 # NOTE: prepare_for_testing calls get_compiler_info, which we need
@@ skipping 129 matching lines @@
 #
 # Tests in K2::k2_m.
 #
 
 gdb_continue_to_breakpoint "continue to fifth breakpoint for temargs"
 
 if $have_older_template_gcc { setup_xfail "*-*-*" }
 gdb_test "ptype F" "type = void \\\(S::\\\*\\\)\\\(S \\\* const\\\)" \
     "test type of F in k2_m"
 
-setup_kfail gcc/49366 "*-*-*"
+setup_xfail gcc/49366 "*-*-*"
 gdb_test "print F" "&S::somefunc" "test value of F in k2_m"
 
 #
 # Tests in K3::k3_m, GCC PR debug/49546.
 # The problem reproduces with DW_AT_MIPS_linkage_name.  It does not happen with
 # GDB physname - GDB's own computation of the linkage name based on
 # (incorrectly output by GCC) DW_AT_name.
 #
 
 gdb_continue_to_breakpoint "continue to sixth breakpoint for temargs"
 
 if $have_older_template_gcc { setup_xfail "*-*-*"
-} else { setup_kfail gcc/49546 "*-*-*" }
+} else { setup_xfail gcc/49546 "*-*-*" }
 gdb_test "ptype F" {type = void \(\*\)\(int\)} "test type of F in k3_m"
 
 if $have_older_template_gcc { setup_xfail "*-*-*"
-} else { setup_kfail gcc/49546 "*-*-*" }
+} else { setup_xfail gcc/49546 "*-*-*" }
 gdb_test "print F" { = \(void \(\*\)\(int\)\) 0x[0-9a-f]+ <S3::m\(int\)>} \
          "test value of F in k3_m"