Re: [PATCH] Fix kfail in gdb.base/callfuncs.exp

[Yao Qi <yao@codesourcery.com>]

On 10/24/2012 10:56 PM, Tom Tromey wrote:
> Yao> The patch below is to replace 'setup_kfail_for_target' with
> Yao> 'setup_kfail', and add one sentence of comment to proc
> Yao> 'setup_kfail_for_target'.  Is it OK?
> 
> Looks good to me, thanks.

When I prepare to commit this patch today, I find that Mark
committed this patch, which makes setup_kfail_for_target useless,
because we don't have to link the same fail to different PRs.

  Re: [PATCH] PR gdb/12776 is now fixed as well; adjust testsuite
  http://sourceware.org/ml/gdb-patches/2012-10/msg00491.html

As we discussed above, I remove proc 'setup_kfail_for_target'
in this patch together.  Committed as the delta part is obvious.

-- 
Yao

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.

Index: testsuite/gdb.base/varargs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/varargs.exp,v
retrieving revision 1.21
diff -u -r1.21 varargs.exp
--- testsuite/gdb.base/varargs.exp	25 Oct 2012 08:59:07 -0000	1.21
+++ testsuite/gdb.base/varargs.exp	25 Oct 2012 13:00:30 -0000
@@ -116,15 +116,15 @@
     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
 
 }
Index: testsuite/gdb.trace/ftrace.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/ftrace.exp,v
retrieving revision 1.6
diff -u -r1.6 ftrace.exp
--- testsuite/gdb.trace/ftrace.exp	26 Jun 2012 18:25:19 -0000	1.6
+++ testsuite/gdb.trace/ftrace.exp	25 Oct 2012 13:00:49 -0000
@@ -132,13 +132,13 @@
 	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 .*" \
cvs diff: Diffing testsuite/gdb.xml
cvs diff: Diffing testsuite/lib
Index: testsuite/lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.220
diff -u -r1.220 gdb.exp
--- testsuite/lib/gdb.exp	15 Oct 2012 17:35:54 -0000	1.220
+++ testsuite/lib/gdb.exp	25 Oct 2012 13:01:22 -0000
@@ -3434,14 +3434,6 @@
     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