Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.cp/static-method.exp
diff --git a/gdb/testsuite/gdb.cp/static-method.exp b/gdb/testsuite/gdb.cp/static-method.exp
index d4dc6fa82648fd82e1819ee008d6b3503c94bb8a..55c34319e5e823607d75a53f91510cd9ad87a5f6 100644
--- a/gdb/testsuite/gdb.cp/static-method.exp
+++ b/gdb/testsuite/gdb.cp/static-method.exp
@@ -41,8 +41,7 @@ proc test_breakpoint {func result} {
 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
@@ -60,7 +59,8 @@ gdb_test_multiple $test $test {
 	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
     }
 }
@@ -87,22 +87,22 @@ foreach test $methods {
     # 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