From 574194f6bcfb90b9f8486002b83babc4c21208c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 31 Aug 2011 13:22:58 +0200
Subject: [PATCH] Replace xfail-stageN with simply xfail-test

Closes #799
---
 mk/pp.mk                                                | 2 +-
 src/test/compile-fail/bad-type-env-capture.rs           | 4 +---
 src/test/compile-fail/constrained-type-missing-check.rs | 4 +---
 src/test/compile-fail/dead-code-be.rs                   | 4 +---
 src/test/compile-fail/dead-code-ret.rs                  | 4 +---
 src/test/compile-fail/infinite-tag-type-recursion.rs    | 4 +---
 src/test/compiletest/header.rs                          | 7 ++-----
 src/test/run-fail/fail-parens.rs                        | 4 +---
 src/test/run-fail/task-comm-14.rs                       | 4 +---
 src/test/run-fail/trivial-message2.rs                   | 4 +---
 src/test/run-pass/acyclic-unwind.rs                     | 4 +---
 src/test/run-pass/alt-type-simple.rs                    | 4 +---
 src/test/run-pass/anon-obj-no-inner-obj.rs              | 4 +---
 src/test/run-pass/anon-obj-refer-to-parallel-method.rs  | 4 +---
 src/test/run-pass/anon-objs-with-fields.rs              | 4 +---
 src/test/run-pass/bind-native.rs                        | 4 +---
 src/test/run-pass/clone-with-exterior.rs                | 4 +---
 src/test/run-pass/first-class-method.rs                 | 4 +---
 src/test/run-pass/infinite-loops.rs                     | 4 +---
 src/test/run-pass/interface-narrowing.rs                | 4 +---
 src/test/run-pass/mlist-cycle.rs                        | 4 +---
 src/test/run-pass/native-mod.rc                         | 4 +---
 src/test/run-pass/native.rc                             | 4 +---
 src/test/run-pass/obj-as.rs                             | 4 +---
 src/test/run-pass/preempt.rs                            | 4 +---
 src/test/run-pass/sio-client.rs                         | 4 +---
 src/test/run-pass/sio-ctx.rs                            | 4 +---
 src/test/run-pass/sio-read.rs                           | 4 +---
 src/test/run-pass/sio-srv.rs                            | 4 +---
 src/test/run-pass/sio-write.rs                          | 4 +---
 src/test/run-pass/syntax-extension-shell.rs             | 4 +---
 src/test/run-pass/task-comm-0.rs                        | 2 +-
 src/test/run-pass/task-comm-10.rs                       | 4 +---
 src/test/run-pass/task-comm-11.rs                       | 1 -
 src/test/run-pass/task-comm-2.rs                        | 4 +---
 src/test/run-pass/task-compare.rs                       | 4 +---
 src/test/run-pass/task-killjoin.rs                      | 4 +---
 src/test/run-pass/type-sizes.rs                         | 4 +---
 src/test/run-pass/use.rs                                | 4 +---
 src/test/run-pass/user.rs                               | 4 +---
 src/test/run-pass/vec-slice.rs                          | 4 +---
 41 files changed, 41 insertions(+), 119 deletions(-)

diff --git a/mk/pp.mk b/mk/pp.mk
index 21ed07d34b7..3dbd8f04d7a 100644
--- a/mk/pp.mk
+++ b/mk/pp.mk
@@ -9,7 +9,7 @@ else
               $(wildcard $(S)src/fuzzer/*.rs)
 
   PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \
-                       "no-reformat\|xfail-pretty\|xfail-stage2")
+                       "no-reformat\|xfail-pretty\|xfail-test")
 endif
 
 reformat: $(SREQ1)
diff --git a/src/test/compile-fail/bad-type-env-capture.rs b/src/test/compile-fail/bad-type-env-capture.rs
index 3e94bdfd9eb..712d1466230 100644
--- a/src/test/compile-fail/bad-type-env-capture.rs
+++ b/src/test/compile-fail/bad-type-env-capture.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // error-pattern: attempted dynamic environment-capture
 fn foo<T>() {
     obj bar(b: T) { }
diff --git a/src/test/compile-fail/constrained-type-missing-check.rs b/src/test/compile-fail/constrained-type-missing-check.rs
index 78c8f64ee9c..6eb5a7c1e62 100644
--- a/src/test/compile-fail/constrained-type-missing-check.rs
+++ b/src/test/compile-fail/constrained-type-missing-check.rs
@@ -1,7 +1,5 @@
 // -*- rust -*-
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // error-pattern:Unsatisfied precondition
 
 tag list { cons(int, @list); nil; }
diff --git a/src/test/compile-fail/dead-code-be.rs b/src/test/compile-fail/dead-code-be.rs
index a40d78b17a9..f2faedb7434 100644
--- a/src/test/compile-fail/dead-code-be.rs
+++ b/src/test/compile-fail/dead-code-be.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 // error-pattern: dead
diff --git a/src/test/compile-fail/dead-code-ret.rs b/src/test/compile-fail/dead-code-ret.rs
index 3200a6825ac..3cfed81fc09 100644
--- a/src/test/compile-fail/dead-code-ret.rs
+++ b/src/test/compile-fail/dead-code-ret.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 // error-pattern: dead
diff --git a/src/test/compile-fail/infinite-tag-type-recursion.rs b/src/test/compile-fail/infinite-tag-type-recursion.rs
index 06592b1e963..2d3a92af888 100644
--- a/src/test/compile-fail/infinite-tag-type-recursion.rs
+++ b/src/test/compile-fail/infinite-tag-type-recursion.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 // error-pattern: tag of infinite size
diff --git a/src/test/compiletest/header.rs b/src/test/compiletest/header.rs
index d953a903c39..a13398cb9fd 100644
--- a/src/test/compiletest/header.rs
+++ b/src/test/compiletest/header.rs
@@ -59,12 +59,9 @@ fn is_test_ignored(config: &config, testfile: &istr) -> bool {
     let found = false;
     for each ln: istr in iter_header(testfile) {
         // FIXME: Can't return or break from iterator
-        found = found
-            || parse_name_directive(ln, ~"xfail-"
-                                    + config.stage_id);
+        found = found || parse_name_directive(ln, ~"xfail-test");
         if (config.mode == common::mode_pretty) {
-            found = found
-                || parse_name_directive(ln, ~"xfail-pretty");
+            found = found || parse_name_directive(ln, ~"xfail-pretty");
         }
     }
     ret found;
diff --git a/src/test/run-fail/fail-parens.rs b/src/test/run-fail/fail-parens.rs
index d78e29de7b4..849d4b41d3b 100644
--- a/src/test/run-fail/fail-parens.rs
+++ b/src/test/run-fail/fail-parens.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // Fail statements without arguments need to be disambiguated in
 // certain positions
 // error-pattern:explicit-failure
diff --git a/src/test/run-fail/task-comm-14.rs b/src/test/run-fail/task-comm-14.rs
index 5e551eca127..d9a1223c355 100644
--- a/src/test/run-fail/task-comm-14.rs
+++ b/src/test/run-fail/task-comm-14.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 io fn main() {
     let port<int> po = port();
 
diff --git a/src/test/run-fail/trivial-message2.rs b/src/test/run-fail/trivial-message2.rs
index 9c77d5a9c4e..5bae5036e6e 100644
--- a/src/test/run-fail/trivial-message2.rs
+++ b/src/test/run-fail/trivial-message2.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 /*
   This program should hang on the po |> r line.
diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs
index 6eb011484db..28a1e9d6708 100644
--- a/src/test/run-pass/acyclic-unwind.rs
+++ b/src/test/run-pass/acyclic-unwind.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/alt-type-simple.rs b/src/test/run-pass/alt-type-simple.rs
index 62e3f209c68..8a6b7b5ce46 100644
--- a/src/test/run-pass/alt-type-simple.rs
+++ b/src/test/run-pass/alt-type-simple.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 fn altsimple(any x) {
   alt type (f) {
     case (int i) { print("int"); }
diff --git a/src/test/run-pass/anon-obj-no-inner-obj.rs b/src/test/run-pass/anon-obj-no-inner-obj.rs
index 5ce20410eef..7326144d18a 100644
--- a/src/test/run-pass/anon-obj-no-inner-obj.rs
+++ b/src/test/run-pass/anon-obj-no-inner-obj.rs
@@ -1,6 +1,4 @@
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 use std;
 
 // This is failing not because it's an anonymous object from nothing
diff --git a/src/test/run-pass/anon-obj-refer-to-parallel-method.rs b/src/test/run-pass/anon-obj-refer-to-parallel-method.rs
index e9cbdaaec1f..6340b128554 100644
--- a/src/test/run-pass/anon-obj-refer-to-parallel-method.rs
+++ b/src/test/run-pass/anon-obj-refer-to-parallel-method.rs
@@ -1,6 +1,4 @@
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 // Test case for issue #822.
 fn main() {
diff --git a/src/test/run-pass/anon-objs-with-fields.rs b/src/test/run-pass/anon-objs-with-fields.rs
index c63f8ac585a..226c2b9fd21 100644
--- a/src/test/run-pass/anon-objs-with-fields.rs
+++ b/src/test/run-pass/anon-objs-with-fields.rs
@@ -1,6 +1,4 @@
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 use std;
 
 fn main() {
diff --git a/src/test/run-pass/bind-native.rs b/src/test/run-pass/bind-native.rs
index 5dd321a5ef2..cb55d90beb4 100644
--- a/src/test/run-pass/bind-native.rs
+++ b/src/test/run-pass/bind-native.rs
@@ -3,9 +3,7 @@ Can we bind native things?
 */
 
 //xfail-stage0
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 native "rust" mod rustrt {
     fn task_yield();
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs
index 1feed8042e7..074da4f0219 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/run-pass/clone-with-exterior.rs
@@ -1,7 +1,5 @@
 //xfail-stage0
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 use std;
 import std::task;
diff --git a/src/test/run-pass/first-class-method.rs b/src/test/run-pass/first-class-method.rs
index c9531a08dc5..e327c7a6cf0 100644
--- a/src/test/run-pass/first-class-method.rs
+++ b/src/test/run-pass/first-class-method.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 // Test case for issue #758.
 obj foo() { fn f() { } }
diff --git a/src/test/run-pass/infinite-loops.rs b/src/test/run-pass/infinite-loops.rs
index f5b7e5ad6b2..3c2be61ac65 100644
--- a/src/test/run-pass/infinite-loops.rs
+++ b/src/test/run-pass/infinite-loops.rs
@@ -2,9 +2,7 @@
   A simple way to make sure threading works. This should use all the
   CPU cycles an any machines that we're likely to see for a while.
 */
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 use std;
 import std::task::join;
diff --git a/src/test/run-pass/interface-narrowing.rs b/src/test/run-pass/interface-narrowing.rs
index 8aca8f2b21d..d5f07efc086 100644
--- a/src/test/run-pass/interface-narrowing.rs
+++ b/src/test/run-pass/interface-narrowing.rs
@@ -1,6 +1,4 @@
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 // Test case for issue #115.
 type base =
diff --git a/src/test/run-pass/mlist-cycle.rs b/src/test/run-pass/mlist-cycle.rs
index 3055792c0d4..b561f84c4b8 100644
--- a/src/test/run-pass/mlist-cycle.rs
+++ b/src/test/run-pass/mlist-cycle.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 use std;
 
diff --git a/src/test/run-pass/native-mod.rc b/src/test/run-pass/native-mod.rc
index 9537942a4ea..73912355ef8 100644
--- a/src/test/run-pass/native-mod.rc
+++ b/src/test/run-pass/native-mod.rc
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 native mod libc = target_libc {
diff --git a/src/test/run-pass/native.rc b/src/test/run-pass/native.rc
index 7a4c20e6fbb..599ee9e7f24 100644
--- a/src/test/run-pass/native.rc
+++ b/src/test/run-pass/native.rc
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 native "rust" mod rustrt {
diff --git a/src/test/run-pass/obj-as.rs b/src/test/run-pass/obj-as.rs
index 42c80b4a883..26c27435ce1 100644
--- a/src/test/run-pass/obj-as.rs
+++ b/src/test/run-pass/obj-as.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 obj big() {
     fn one() -> int { ret 1; }
     fn two() -> int { ret 2; }
diff --git a/src/test/run-pass/preempt.rs b/src/test/run-pass/preempt.rs
index 4fc67429e2c..196f54c1449 100644
--- a/src/test/run-pass/preempt.rs
+++ b/src/test/run-pass/preempt.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // This checks that preemption works.
 
 fn starve_main(alive: chan<int>) {
diff --git a/src/test/run-pass/sio-client.rs b/src/test/run-pass/sio-client.rs
index f2039013fd0..f3eefbcaef9 100644
--- a/src/test/run-pass/sio-client.rs
+++ b/src/test/run-pass/sio-client.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 use std;
 import std::sio;
 import std::task;
diff --git a/src/test/run-pass/sio-ctx.rs b/src/test/run-pass/sio-ctx.rs
index dd77bb9dedd..ea3374e493f 100644
--- a/src/test/run-pass/sio-ctx.rs
+++ b/src/test/run-pass/sio-ctx.rs
@@ -1,7 +1,5 @@
 // Seems to hang for long periods, probably with RUST_THREADS > 1. Issue #810
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 use std;
 import std::sio;
diff --git a/src/test/run-pass/sio-read.rs b/src/test/run-pass/sio-read.rs
index 688aec7a40f..194c55a1508 100644
--- a/src/test/run-pass/sio-read.rs
+++ b/src/test/run-pass/sio-read.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 use std;
 import std::sio;
 import std::task;
diff --git a/src/test/run-pass/sio-srv.rs b/src/test/run-pass/sio-srv.rs
index a6ff53598ca..c51a2c0d9d4 100644
--- a/src/test/run-pass/sio-srv.rs
+++ b/src/test/run-pass/sio-srv.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 use std;
 import std::sio;
 import std::net;
diff --git a/src/test/run-pass/sio-write.rs b/src/test/run-pass/sio-write.rs
index bdce70b97a1..63e1cf4f3b1 100644
--- a/src/test/run-pass/sio-write.rs
+++ b/src/test/run-pass/sio-write.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 use std;
 import std::sio;
 import std::task;
diff --git a/src/test/run-pass/syntax-extension-shell.rs b/src/test/run-pass/syntax-extension-shell.rs
index 27c4a302b7a..a7189359121 100644
--- a/src/test/run-pass/syntax-extension-shell.rs
+++ b/src/test/run-pass/syntax-extension-shell.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 fn main() {
   auto s = #shell { uname -a };
   log s;
diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs
index acaa2b5f9b7..424304ebc5f 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -1,5 +1,5 @@
 // Temporarily xfailing, because something is wrong.
-// xfail-stage2
+// xfail-test
 use std;
 
 import std::comm;
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index 39157600263..c2fd52b875f 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -1,9 +1,7 @@
 // FIXME: this test is xfailed until sending strings is legal again.
 
 //xfail-stage0
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 use std;
 import std::task;
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs
index 2a46121b974..aed656c9f2a 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -1,4 +1,3 @@
-// xfail-stage3
 use std;
 import std::comm;
 import std::task;
diff --git a/src/test/run-pass/task-comm-2.rs b/src/test/run-pass/task-comm-2.rs
index 4dfc143991c..2028c408e2e 100644
--- a/src/test/run-pass/task-comm-2.rs
+++ b/src/test/run-pass/task-comm-2.rs
@@ -1,7 +1,5 @@
 // Broken under win
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 use std;
 
diff --git a/src/test/run-pass/task-compare.rs b/src/test/run-pass/task-compare.rs
index 0e9116b65d3..4ef6bcaf5c4 100644
--- a/src/test/run-pass/task-compare.rs
+++ b/src/test/run-pass/task-compare.rs
@@ -4,9 +4,7 @@
 
 // FIXME: This won't work until we can compare resources
 // xfail-stage0
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 use std;
 import std::task;
diff --git a/src/test/run-pass/task-killjoin.rs b/src/test/run-pass/task-killjoin.rs
index cfed8c136ab..43690cfb104 100644
--- a/src/test/run-pass/task-killjoin.rs
+++ b/src/test/run-pass/task-killjoin.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 
 // Create a task that is supervised by another task,
 // join the supervised task from the supervising task,
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index 25020ec3ed0..5b17568f5dc 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 import std::sys::rustrt::size_of;
 use std;
 
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index 2c4539e3534..5d5142965ed 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 use std;
 use libc;
 use zed(name = "std");
diff --git a/src/test/run-pass/user.rs b/src/test/run-pass/user.rs
index 994003d1fe2..a17a5021ca8 100644
--- a/src/test/run-pass/user.rs
+++ b/src/test/run-pass/user.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 use std (name = "std",
diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs
index f734059466f..c03b8c4611a 100644
--- a/src/test/run-pass/vec-slice.rs
+++ b/src/test/run-pass/vec-slice.rs
@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 fn main() {
   let vec<int> v = [1,2,3,4,5];
   auto v2 = v.(1,2);