Merge GDB 7.5.1

gdb/testsuite/gdb.cp/static-method.exp

 # Copyright 2011-2012 Free Software Foundation, Inc.
 #
 # Contributed by Red Hat, originally written by Keith Seitz.
 #
 # 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,
@@ skipping 23 matching lines @@
         gdb_breakpoint "$func"
         gdb_test "continue" \
             "Continuing.\r\n\r\nBreakpoint $DEC+,.*$result.*" \
             "continue to $func"
     }
 }
 
 if {[skip_cplus_tests]} { continue }
 
 # Tests for c++/12750
-set testfile "static-method"
-set srcfile $testfile.cc
+standard_testfile .cc
 
 if {[prepare_for_testing $testfile $testfile $srcfile {c++ debug}]} {
     return -1
 }
 
 # The GDB workaround for GCC PR debug/45682 does not apply as it requires
 # DW_AT_linkage_name of methods.  The whole class A is in anonymous namespace,
 # therefore not accessible outside of the CU (compilation unit) and therefore
 # GCC does not produce DW_AT_linkage_name for such methods.
 
 set have_gcc_45682_fixed 1
 set test "info addr A::func()"
 gdb_test_multiple $test $test {
     -re "No symbol \"A::func\\(\\)\" in current context\\.\r\n$gdb_prompt $" {
         pass $test
     }
     -re "Symbol \"A::func\\(\\)\" is a function at address .*\r\n$gdb_prompt $" {
-        kfail gcc/45682 $test
+        setup_xfail gcc/45682 "*-*-*"
+        fail $test
         set have_gcc_45682_fixed 0
     }
 }
 
 if {![runto_main]} {
     perror "couldn't run to breakpoint"
     continue
 }
 
 set ans {(anonymous namespace)}
 set methods {}
 lappend methods "xxx::${ans}::func"
 lappend methods "xxx::${ans}::A::func"
 
 gdb_test_no_output "set listsize 1" ""
 
 foreach test $methods {
     # The result we expect is the source code name of the symbol,
     # i.e., without "(anonymous namespace)".
     regsub -all [string_to_regexp "${ans}::"] $test "" expected
     set result ".*// [string_to_regexp $expected]"
 
     # Test whether the function/method can be "list"ed
     # with the filename pre-pended.
     if {[string compare $test "xxx::${ans}::A::func"] == 0
         && !$have_gcc_45682_fixed} {
-        setup_kfail gcc/45682 "*-*-*"
+        setup_xfail gcc/45682 "*-*-*"
     }
     gdb_test "list ${srcfile}:$test" $result
     if {[string compare $test "xxx::${ans}::A::func"] == 0
         && !$have_gcc_45682_fixed} {
-        setup_kfail gcc/45682 "*-*-*"
+        setup_xfail gcc/45682 "*-*-*"
     }
     gdb_test "list '${srcfile}:$test'" $result
     if {[string compare $test "xxx::${ans}::A::func"] == 0
         && !$have_gcc_45682_fixed} {
-        setup_kfail gcc/45682 "*-*-*"
+        setup_xfail gcc/45682 "*-*-*"
     }
     gdb_test "list '${srcfile}':'$test'" $result
     if {[string compare $test "xxx::${ans}::A::func"] == 0
         && !$have_gcc_45682_fixed} {
-        setup_kfail gcc/45682 "*-*-*"
+        setup_xfail gcc/45682 "*-*-*"
     }
     gdb_test "list ${srcfile}:'$test'" $result
 
     # Test setting and hitting a breakoint at the function/method.
     test_breakpoint $test $expected
     test_breakpoint "'$test'" $expected
 }
 
 gdb_exit
 return 0