gdb/testsuite:

	* gdb.trace/ftrace.exp (test_fast_tracepoints): Use
	'setup_kfail' instead of 'setup_kfail_for_target'.
	* gdb.base/varargs.exp: Likewise.
	* lib/gdb.exp (setup_kfail_for_target): Remove.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 473bf76..b35c336 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-25  Yao Qi  <yao@codesourcery.com>
+
+       * gdb.trace/ftrace.exp (test_fast_tracepoints): Use
+       'setup_kfail' instead of 'setup_kfail_for_target'.
+       * gdb.base/varargs.exp: Likewise.
+       * lib/gdb.exp (setup_kfail_for_target): Remove.
+
 2012-10-25  Mark Kettenis  <kettenis@openbsd.nfra.nl>
 
        * gdb.base/varargs.exp: PR gdb/12790 is now fixed.

diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index fdeb3f9..bb9eb2a 100644 (file)
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -116,15 +116,15 @@ if [support_complex_tests] {
     global gdb_prompt
 
     set test "print find_max_float_real(4, fc1, fc2, fc3, fc4)"
-    setup_kfail_for_target gdb/12791 "arm*-*-*"
+    setup_kfail gdb/12791 "arm*-*-*"
     gdb_test $test ".*= 4 \\+ 4 \\* I" $test
 
     set test "print find_max_double_real(4, dc1, dc2, dc3, dc4)"
-    setup_kfail_for_target gdb/12791 "arm*-*-*"
+    setup_kfail gdb/12791 "arm*-*-*"
     gdb_test $test ".*= 4 \\+ 4 \\* I" $test
 
     set test "print find_max_long_double_real(4, ldc1, ldc2, ldc3, ldc4)"
-    setup_kfail_for_target gdb/12791 "arm*-*-*"
+    setup_kfail gdb/12791 "arm*-*-*"
     gdb_test $test ".*= 4 \\+ 4 \\* I" $test
 
 }

diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index 56cd2fa..2a3dbae 100644 (file)
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -132,13 +132,13 @@ proc test_fast_tracepoints {} {
        gdb_test "tfind pc *set_point" "Found trace frame .*" \
            "tfind set_point frame, first time"
 
-       setup_kfail_for_target "gdb/13808" "x86_64-*-linux*"
+       setup_kfail "gdb/13808" "x86_64-*-linux*"
        gdb_test "print globvar" " = 1"
 
        gdb_test "tfind pc *set_point" "Found trace frame .*" \
            "tfind set_point frame, second time"
 
-       setup_kfail_for_target "gdb/13808" "x86_64-*-linux*"
+       setup_kfail "gdb/13808" "x86_64-*-linux*"
        gdb_test "print anarg" " = 200"
 
        gdb_test "tfind start" "Found trace frame .*" \

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index f27d4a7..a972045 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3434,14 +3434,6 @@ proc setup_xfail_format { format } {
     return $ret;
 }
 
-# Like setup_kfail, but only call setup_kfail conditionally if
-# istarget[TARGET] returns true.
-proc setup_kfail_for_target { PR target } {
-    if { [istarget $target] } {
-       setup_kfail $PR $target
-    }
-}
-
 # gdb_get_line_number TEXT [FILE]
 #
 # Search the source file FILE, and return the line number of the