* gdb.arch/i386-prologue.exp (skip_breakpoint): Fix setup_kfail

	argument order.
	* gdb.base/macscp.exp: Fix setup_kfail argument order.
	* gdb.base/long_long.exp (gdb_test_xxx): Fix setup_kfail argument
	order.
	* gdb.base/sigbpt.exp (stepi_out): Fix setup_kfail argument
	order.
	* gdb.base/call-sc.exp (setup_kfails): Remove.
	(setup_compiler_kfails): Remove.
	* gdb.base/callfuncs.exp (do_function_calls): Fix setup_kfail
	argument order.
	* gdb.base/siginfo.exp: Fix setup_kfail argument order.
	* gdb.base/sigstep.exp (advance): Fix setup_kfail argument order.
	(advancei): Fix setup_kfail argument order.
	* gdb.base/radix.exp: Fix setup_kfail argument order.
	* gdb.base/solib-weak.exp (do_test): Fix setup_kfail argument
	order.
	* gdb.base/structs.exp (setup_kfails): Remove.
	(setup_compiler_kfails): Fix setup_kfail argument order.
	* gdb.base/sigaltstack.exp (finish_test): Fix setup_kfail argument
	order.
	* gdb.java/jmain.exp: Fix setup_kfail argument order.
	* gdb.pascal/types.exp (test_string_literal_types_accepted): Fix
	setup_kfail argument order.
	* gdb.cp/overload.exp: Fix setup_kfail argument order.

11 files changed, 26 insertions, 65 deletions

diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 3a8dd33..77cac74 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -43,22 +43,6 @@ if [get_compiler_info ${binfile}] {
     return -1;
 }
 
-# Use the file name, compiler and tuples to set up any needed KFAILs.
-
-proc setup_kfails { file tuples bug } {
-    global testfile
-    if [string match $file $testfile] {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-proc setup_compiler_kfails { file compiler format tuples bug } {
-    global testfile
-    if {[string match $file $testfile] && [test_compiler_info $compiler]  && [test_debug_format $format]} {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
 # Compile a variant of scalars.c using TYPE to specify the type of the
 # parameter and return-type.  Run the compiled program up to "main".
 # Also updates the global "testfile" to reflect the most recent build.
@@ -134,22 +118,6 @@ proc I2A { n } {
 }
 
 
-# Use the file name, compiler and tuples to set up any needed KFAILs.
-
-proc setup_kfails { file tuples bug } {
-    global testfile
-    if [string match $file $testfile] {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-proc setup_compiler_kfails { file compiler format tuples bug } {
-    global testfile
-    if {[string match $file $testfile] && [test_compiler_info $compiler]  && [test_debug_format $format]} {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
 # Test GDB's ability to make inferior function calls to functions
 # returning (or passing) in a single scalar.
 
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index d660051..b6bd885 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -190,17 +190,17 @@ proc do_function_calls {} {
     # function body.  This results in the called function treating the
     # first few instructions of the function proper as a descriptor
     # and attempting a jump through that (a totally random address).
-    setup_kfail "rs6000*-*-aix*" gdb/1457
-    setup_kfail "powerpc*-*-aix*" gdb/1457
-    setup_kfail hppa*-*-hpux* gdb/1457
+    setup_kfail gdb/1457 "rs6000*-*-aix*"
+    setup_kfail gdb/1457 "powerpc*-*-aix*"
+    setup_kfail gdb/1457 hppa*-*-hpux*
     gdb_test "p t_func_values(add,func_val2)" " = 1"
-    setup_kfail "rs6000*-*-aix*" gdb/1457
-    setup_kfail "powerpc*-*-aix*" gdb/1457
-    setup_kfail hppa*-*-hpux* gdb/1457
+    setup_kfail gdb/1457 "rs6000*-*-aix*"
+    setup_kfail gdb/1457 "powerpc*-*-aix*"
+    setup_kfail gdb/1457 hppa*-*-hpux*
     gdb_test "p t_func_values(func_val1,doubleit)" " = 1"
-    setup_kfail "rs6000*-*-aix*" gdb/1457
-    setup_kfail "powerpc*-*-aix*" gdb/1457
-    setup_kfail hppa*-*-hpux* gdb/1457
+    setup_kfail gdb/1457 "rs6000*-*-aix*"
+    setup_kfail gdb/1457 "powerpc*-*-aix*"
+    setup_kfail gdb/1457 hppa*-*-hpux*
     gdb_test "p t_call_add(add,3,4)" " = 7"
     gdb_test "p t_call_add(func_val1,3,4)" " = 7"
 
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
index bc84b18..9112b65 100644
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ b/gdb/testsuite/gdb.base/long_long.exp
@@ -85,7 +85,7 @@ proc pat2 { n pats } {
 
 proc gdb_test_xxx { test pat name } {
     if { $pat == "" } {
-	setup_kfail *-*-* gdb/1672
+	setup_kfail gdb/1672 *-*-*
 	gdb_test $test "xxx" $name
     } else {
 	gdb_test $test $pat $name
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index ed39bf4..97cb1bb 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -243,7 +243,7 @@ switch -exact -- [info_macro WHERE] {
         pass "info macro WHERE after `list macscp_4_2_from_macscp2'"
     }
     {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}} {
-        setup_kfail *-*-* "gdb/555"
+        setup_kfail"gdb/555" *-*-* 
         fail "info macro WHERE after `list macscp_4_2_from_macscp2' (gdb/555)"
     }
     timeout { 
@@ -258,7 +258,7 @@ switch -exact -- [info_macro WHERE] {
         pass "info macro WHERE after `list macscp_4_2_from_macscp3'"
     }
     {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}} {
-        setup_kfail *-*-* "gdb/555"
+        setup_kfail"gdb/555" *-*-* 
         fail "info macro WHERE after `list macscp_4_2_from_macscp3' (gdb/555)"
     }
     timeout {
@@ -370,7 +370,7 @@ for {set i 0} {$i < [llength $funcs]} {incr i} {
     if {[string compare $result $expected] == 0} {
         pass "info macro WHERE stopped in $func"
     } elseif {[string compare $result $kfail_expected] == 0} {
-        setup_kfail *-*-* "gdb/555"
+        setup_kfail"gdb/555" *-*-* 
         fail "info macro WHERE stopped in $func (gdb/555)"
     } elseif {[string compare $result timeout] == 0} {
         fail "info macro WHERE stopped in $func (timeout)"
diff --git a/gdb/testsuite/gdb.base/radix.exp b/gdb/testsuite/gdb.base/radix.exp
index 3d7c0a0..72cf575 100644
--- a/gdb/testsuite/gdb.base/radix.exp
+++ b/gdb/testsuite/gdb.base/radix.exp
@@ -133,7 +133,7 @@ test_output_radix 8 "8" "10"
     test_one_output 8  "0xf"        "17"
     test_one_output 8  "10"         "12"
     test_one_output 8  "100"        "144"
-    setup_kfail *-*-* "gdb/1715"
+    setup_kfail "gdb/1715" *-*-*
     test_one_output 8  "20."        "24"
     test_one_output 8  "(int) 20."  "24"
 
@@ -150,7 +150,7 @@ test_output_radix 16 "10" "20"
     test_one_output 16 "0xf"        "f"
     test_one_output 16 "10"         "a"
     test_one_output 16 "100"        "64"
-    setup_kfail *-*-* "gdb/1715"
+    setup_kfail "gdb/1715" *-*-*
     test_one_output 16 "20."        "14"
     test_one_output 16 "(int) 20."  "14"
 
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
index 2482b9d..869e89f 100644
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ b/gdb/testsuite/gdb.base/sigaltstack.exp
@@ -83,8 +83,8 @@ proc finish_test { pattern msg } {
 	    # Some platforms use a special read-only page for signal
 	    # trampolines.  We can't set a breakpoint there, and we
 	    # don't gracefully fall back to single-stepping.
-	    setup_kfail "i?86-*-linux*" gdb/1736
-	    setup_kfail "*-*-openbsd*" gdb/1736
+	    setup_kfail gdb/1736 "i?86-*-linux*"
+	    setup_kfail gdb/1736 "*-*-openbsd*"
 	    fail "$msg (could not set breakpoint)"
 	}
 	-re "$pattern.*${gdb_prompt} $" {
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index 660190a..6a6c58e 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -171,7 +171,7 @@ proc stepi_out { name args } {
     set test "${name}; stepi out of handler"
     gdb_test_multiple "stepi" "$test" {
 	-re "Could not insert single-step breakpoint.*$gdb_prompt $" {
-	    setup_kfail "sparc*-*-openbsd*" gdb/1736
+	    setup_kfail gdb/1736 "sparc*-*-openbsd*"
 	    fail "$test (could not insert single-step breakpoint)"
 	}
 	-re "keeper.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp
index 102d894..03f4c20 100644
--- a/gdb/testsuite/gdb.base/siginfo.exp
+++ b/gdb/testsuite/gdb.base/siginfo.exp
@@ -73,7 +73,7 @@ gdb_expect_list "backtrace for nexti" ".*$gdb_prompt $" {
 set test "step out of handler"
 gdb_test_multiple "step" "${test}" {
     -re "Could not insert single-step breakpoint.*$gdb_prompt $" {
-	setup_kfail sparc*-*-openbsd* gdb/1736
+	setup_kfail gdb/1736 sparc*-*-openbsd*
 	fail "$test (could not insert single-step breakpoint)"
     }
     -re "done = 1;.*${gdb_prompt} $" {
diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
index 81d90c9..e0c236a 100644
--- a/gdb/testsuite/gdb.base/sigstep.exp
+++ b/gdb/testsuite/gdb.base/sigstep.exp
@@ -78,7 +78,7 @@ proc advance { i } {
     set test "$prefix; leave handler"
     gdb_test_multiple "$i" "${test}" {
 	-re "Could not insert single-step breakpoint.*$gdb_prompt $" {
-	    setup_kfail "sparc*-*-openbsd*" gdb/1736
+	    setup_kfail gdb/1736 "sparc*-*-openbsd*"
 	    fail "$test (could not insert single-step breakpoint)"
 	}
 	-re "done = 1;.*${gdb_prompt} $" {
@@ -90,7 +90,7 @@ proc advance { i } {
 	    exp_continue -continue_timer
 	}
 	-re "Program exited normally.*${gdb_prompt} $" {
-	    setup_kfail powerpc-*-*bsd* gdb/1639
+	    setup_kfail gdb/1639 powerpc-*-*bsd*
 	    fail "$test (program exited)"
 	}
 	-re "(while ..done|done = 0).*${gdb_prompt} $" {
@@ -119,13 +119,13 @@ proc advancei { i } {
             # Some platforms use a special read-only page for signal
             # trampolines.  We can't set a breakpoint there, and we
             # don't gracefully fall back to single-stepping.
-            setup_kfail "i?86-*-linux*" gdb/1736
-	    setup_kfail "*-*-openbsd*" gdb/1736
+            setup_kfail gdb/1736 "i?86-*-linux*"
+	    setup_kfail gdb/1736 "*-*-openbsd*"
             fail "$test (could not set breakpoint)"
 	    return
         }
 	-re "Could not insert single-step breakpoint.*$gdb_prompt $" {
-	    setup_kfail "sparc*-*-openbsd*" gdb/1736
+	    setup_kfail gdb/1736 "sparc*-*-openbsd*"
 	    fail "$test (could not insert single-step breakpoint)"
 	}
 	-re "Breakpoint \[0-9\]*, handler .*${gdb_prompt} $" {
diff --git a/gdb/testsuite/gdb.base/solib-weak.exp b/gdb/testsuite/gdb.base/solib-weak.exp
index 34bb6d0..bfa59ee 100644
--- a/gdb/testsuite/gdb.base/solib-weak.exp
+++ b/gdb/testsuite/gdb.base/solib-weak.exp
@@ -106,7 +106,7 @@ proc do_test { lib1opts lib2opts lib1first } {
 
     if {(${lib1opts} == "" && ${lib2opts} != "" && ${lib1first} == 1)
 	|| (${lib1opts} != "" && ${lib2opts} == "" && ${lib1first} == 0)} {
-	setup_kfail *-*-* gdb/1824
+	setup_kfail gdb/1824 *-*-*
     }
 
     gdb_test "continue" "Breakpoint .* bar .*${expected_file}\\..*" \
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index ddfd208..c739084 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -215,17 +215,10 @@ proc I2A { n } {
 
 # Use the file name, compiler and tuples to set up any needed KFAILs.
 
-proc setup_kfails { file tuples bug } {
-    global testfile
-    if [string match $file $testfile] {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
 proc setup_compiler_kfails { file compiler format tuples bug } {
     global testfile
     if {[string match $file $testfile] && [test_compiler_info $compiler]  && [test_debug_format $format]} {
-	foreach f $tuples { setup_kfail $f $bug }
+	foreach f $tuples { setup_kfail $bug $f }
     }
 }