Assume xfail-stage0 implies stage1 and stage2 in tests, for now.

99 files changed, 198 insertions, 0 deletions

diff --git a/src/test/bench/shootout/fasta.rs b/src/test/bench/shootout/fasta.rs
index 82d65e84..7afa1a7a 100644
--- a/src/test/bench/shootout/fasta.rs
+++ b/src/test/bench/shootout/fasta.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 /* -*- mode: rust; indent-tabs-mode: nil -*-
  * Implementation of 'fasta' benchmark from
  * Computer Language Benchmarks Game
diff --git a/src/test/compile-fail/bad-alt.rs b/src/test/compile-fail/bad-alt.rs
index 0b5dbbfe..c91274be 100644
--- a/src/test/compile-fail/bad-alt.rs
+++ b/src/test/compile-fail/bad-alt.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: Unexpected token 'x'
 
 fn main() {
diff --git a/src/test/compile-fail/bad-env-capture.rs b/src/test/compile-fail/bad-env-capture.rs
index 8e30ac44..55fa7473 100644
--- a/src/test/compile-fail/bad-env-capture.rs
+++ b/src/test/compile-fail/bad-env-capture.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: attempted dynamic environment-capture
 fn foo() {
   let int x;
diff --git a/src/test/compile-fail/bad-main.rs b/src/test/compile-fail/bad-main.rs
index d1a5203f..b8b8676c 100644
--- a/src/test/compile-fail/bad-main.rs
+++ b/src/test/compile-fail/bad-main.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: bad type signature
 
 fn main(int x) {
diff --git a/src/test/compile-fail/bad-name.rs b/src/test/compile-fail/bad-name.rs
index 99324ce1..f015ef99 100644
--- a/src/test/compile-fail/bad-name.rs
+++ b/src/test/compile-fail/bad-name.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 
 // error-pattern: malformed name
 
diff --git a/src/test/compile-fail/bad-recv.rs b/src/test/compile-fail/bad-recv.rs
index 031d1059..7b7c86ef 100644
--- a/src/test/compile-fail/bad-recv.rs
+++ b/src/test/compile-fail/bad-recv.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: mismatched types
 
 fn main() {
diff --git a/src/test/compile-fail/bad-send.rs b/src/test/compile-fail/bad-send.rs
index 4a97539f..d0a820ee 100644
--- a/src/test/compile-fail/bad-send.rs
+++ b/src/test/compile-fail/bad-send.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: mismatched types
 
 fn main() {
diff --git a/src/test/compile-fail/bad-type-env-capture.rs b/src/test/compile-fail/bad-type-env-capture.rs
index 53b96278..00f314dd 100644
--- a/src/test/compile-fail/bad-type-env-capture.rs
+++ b/src/test/compile-fail/bad-type-env-capture.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: attempted dynamic environment-capture
 fn foo[T]() { obj bar(T b) {} }
 fn main() {}
\ No newline at end of file
diff --git a/src/test/compile-fail/bind-alias.rs b/src/test/compile-fail/bind-alias.rs
index 7d85d07f..29a8008e 100644
--- a/src/test/compile-fail/bind-alias.rs
+++ b/src/test/compile-fail/bind-alias.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: binding alias slot
 
 fn f(&int x) {}
diff --git a/src/test/compile-fail/constructor-as-cast.rs b/src/test/compile-fail/constructor-as-cast.rs
index 6d81b693..53d115c7 100644
--- a/src/test/compile-fail/constructor-as-cast.rs
+++ b/src/test/compile-fail/constructor-as-cast.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: non-type context
 type base =
   obj {
diff --git a/src/test/compile-fail/dead-code-be.rs b/src/test/compile-fail/dead-code-be.rs
index 5a069c5a..159c60e5 100644
--- a/src/test/compile-fail/dead-code-be.rs
+++ b/src/test/compile-fail/dead-code-be.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- 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 c992e4e5..1721fe58 100644
--- a/src/test/compile-fail/dead-code-ret.rs
+++ b/src/test/compile-fail/dead-code-ret.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: dead
diff --git a/src/test/compile-fail/direct-obj-fn-call.rs b/src/test/compile-fail/direct-obj-fn-call.rs
index e4184ccd..0ffa2887 100644
--- a/src/test/compile-fail/direct-obj-fn-call.rs
+++ b/src/test/compile-fail/direct-obj-fn-call.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 
 // error-pattern: is not a mod
 
diff --git a/src/test/compile-fail/does-nothing.rs b/src/test/compile-fail/does-nothing.rs
index e6680193..e1a74d36 100644
--- a/src/test/compile-fail/does-nothing.rs
+++ b/src/test/compile-fail/does-nothing.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: does nothing
 fn main() {
   log "doing";
diff --git a/src/test/compile-fail/export-boot.rs b/src/test/compile-fail/export-boot.rs
index 7a9fc776..892f544f 100644
--- a/src/test/compile-fail/export-boot.rs
+++ b/src/test/compile-fail/export-boot.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: unknown module item
 
 // rustboot has a different error message than rustc
diff --git a/src/test/compile-fail/infinite-tag-type-recursion.rs b/src/test/compile-fail/infinite-tag-type-recursion.rs
index 8ba0e25b..95b3bf90 100644
--- a/src/test/compile-fail/infinite-tag-type-recursion.rs
+++ b/src/test/compile-fail/infinite-tag-type-recursion.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: tag of infinite size
diff --git a/src/test/compile-fail/infinite-vec-type-recursion.rs b/src/test/compile-fail/infinite-vec-type-recursion.rs
index 4534f119..d81f60c1 100644
--- a/src/test/compile-fail/infinite-vec-type-recursion.rs
+++ b/src/test/compile-fail/infinite-vec-type-recursion.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: infinite recursive type definition
diff --git a/src/test/compile-fail/item-name-overload.rs b/src/test/compile-fail/item-name-overload.rs
index 5cff8b98..8b99dbbd 100644
--- a/src/test/compile-fail/item-name-overload.rs
+++ b/src/test/compile-fail/item-name-overload.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: name
diff --git a/src/test/compile-fail/missing-return.rs b/src/test/compile-fail/missing-return.rs
index 4c73a4fd..d23a57f1 100644
--- a/src/test/compile-fail/missing-return.rs
+++ b/src/test/compile-fail/missing-return.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: return
 
 fn f() -> int {
diff --git a/src/test/compile-fail/no-self-dispatch.rs b/src/test/compile-fail/no-self-dispatch.rs
index 96089e67..324d1af9 100644
--- a/src/test/compile-fail/no-self-dispatch.rs
+++ b/src/test/compile-fail/no-self-dispatch.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: unresolved identifier
 obj oT() {
   fn get() -> int {
diff --git a/src/test/compile-fail/not-a-pred.rs b/src/test/compile-fail/not-a-pred.rs
index c599f3bc..fe58114a 100644
--- a/src/test/compile-fail/not-a-pred.rs
+++ b/src/test/compile-fail/not-a-pred.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: mismatched types
diff --git a/src/test/compile-fail/pred-on-wrong-slots.rs b/src/test/compile-fail/pred-on-wrong-slots.rs
index 7106df5c..cd609b7d 100644
--- a/src/test/compile-fail/pred-on-wrong-slots.rs
+++ b/src/test/compile-fail/pred-on-wrong-slots.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: Unsatisfied .* lt(a, c)
diff --git a/src/test/compile-fail/put-in-fn.rs b/src/test/compile-fail/put-in-fn.rs
index 22882ff2..71b1666a 100644
--- a/src/test/compile-fail/put-in-fn.rs
+++ b/src/test/compile-fail/put-in-fn.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: iterator function
 
 fn f() -> int {
diff --git a/src/test/compile-fail/slot-as-pred.rs b/src/test/compile-fail/slot-as-pred.rs
index 2ba4a30c..520650f8 100644
--- a/src/test/compile-fail/slot-as-pred.rs
+++ b/src/test/compile-fail/slot-as-pred.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: mismatched types
diff --git a/src/test/compile-fail/spawn-non-nil-fn.rs b/src/test/compile-fail/spawn-non-nil-fn.rs
index bd7d7d9f..4ddb3fbf 100644
--- a/src/test/compile-fail/spawn-non-nil-fn.rs
+++ b/src/test/compile-fail/spawn-non-nil-fn.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: mismatched types
 
 fn f(int x) -> int {
diff --git a/src/test/compile-fail/unbalanced-comment.rs b/src/test/compile-fail/unbalanced-comment.rs
index f49e7447..4f725598 100644
--- a/src/test/compile-fail/unbalanced-comment.rs
+++ b/src/test/compile-fail/unbalanced-comment.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: token
diff --git a/src/test/compile-fail/writing-through-read-alias.rs b/src/test/compile-fail/writing-through-read-alias.rs
index 373c6082..e88a8399 100644
--- a/src/test/compile-fail/writing-through-read-alias.rs
+++ b/src/test/compile-fail/writing-through-read-alias.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern: writing to immutable type
diff --git a/src/test/compile-fail/writing-to-immutable-obj.rs b/src/test/compile-fail/writing-to-immutable-obj.rs
index 563fc9cd..4cdab570 100644
--- a/src/test/compile-fail/writing-to-immutable-obj.rs
+++ b/src/test/compile-fail/writing-to-immutable-obj.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: writing to immutable type
 obj objy(int x) {
     fn foo() -> () {
diff --git a/src/test/compile-fail/writing-to-immutable-rec.rs b/src/test/compile-fail/writing-to-immutable-rec.rs
index 8e94dfd9..3755c549 100644
--- a/src/test/compile-fail/writing-to-immutable-rec.rs
+++ b/src/test/compile-fail/writing-to-immutable-rec.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: writing to immutable type
 fn main() {
   let rec(int x) r = rec(x=1);
diff --git a/src/test/compile-fail/writing-to-immutable-tup.rs b/src/test/compile-fail/writing-to-immutable-tup.rs
index e05aa55b..68c9e7cd 100644
--- a/src/test/compile-fail/writing-to-immutable-tup.rs
+++ b/src/test/compile-fail/writing-to-immutable-tup.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: writing to immutable type
 fn main() {
   let tup(int) t = tup(1);
diff --git a/src/test/compile-fail/writing-to-immutable-vec.rs b/src/test/compile-fail/writing-to-immutable-vec.rs
index dac122b8..cb4030ea 100644
--- a/src/test/compile-fail/writing-to-immutable-vec.rs
+++ b/src/test/compile-fail/writing-to-immutable-vec.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern: writing to immutable type
 fn main() {
   let vec[int] v = vec(1, 2, 3);
diff --git a/src/test/run-fail/explicit-fail.rs b/src/test/run-fail/explicit-fail.rs
index 3ab821d5..37387463 100644
--- a/src/test/run-fail/explicit-fail.rs
+++ b/src/test/run-fail/explicit-fail.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern:explicit
 
 fn main() {
diff --git a/src/test/run-fail/fail.rs b/src/test/run-fail/fail.rs
index c688a404..50269869 100644
--- a/src/test/run-fail/fail.rs
+++ b/src/test/run-fail/fail.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // error-pattern:1 == 2
 
 fn main() {
diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs
index 60e82200..f6800088 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:1 == 2
diff --git a/src/test/run-fail/non-exhaustive-match.rs b/src/test/run-fail/non-exhaustive-match.rs
index 85418022..0600f0c5 100644
--- a/src/test/run-fail/non-exhaustive-match.rs
+++ b/src/test/run-fail/non-exhaustive-match.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:non-exhaustive match failure
diff --git a/src/test/run-fail/pred.rs b/src/test/run-fail/pred.rs
index d4430703..fa2a206b 100644
--- a/src/test/run-fail/pred.rs
+++ b/src/test/run-fail/pred.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:predicate check
diff --git a/src/test/run-fail/str-overrun.rs b/src/test/run-fail/str-overrun.rs
index 68b1e263..078c7493 100644
--- a/src/test/run-fail/str-overrun.rs
+++ b/src/test/run-fail/str-overrun.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-fail/task-comm-14.rs b/src/test/run-fail/task-comm-14.rs
index b56723c2..e2ac165c 100644
--- a/src/test/run-fail/task-comm-14.rs
+++ b/src/test/run-fail/task-comm-14.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 io fn main() {
     let port[int] po = port();
 
diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/run-fail/vec-overrun.rs
index 810feb39..1eaedff9 100644
--- a/src/test/run-fail/vec-overrun.rs
+++ b/src/test/run-fail/vec-overrun.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-fail/vec-underrun.rs b/src/test/run-fail/vec-underrun.rs
index f1998da5..fab59869 100644
--- a/src/test/run-fail/vec-underrun.rs
+++ b/src/test/run-fail/vec-underrun.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs
index 3f3b108c..61793773 100644
--- a/src/test/run-pass/acyclic-unwind.rs
+++ b/src/test/run-pass/acyclic-unwind.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn f(chan[int] c)
diff --git a/src/test/run-pass/alt-type-simple.rs b/src/test/run-pass/alt-type-simple.rs
index 62193866..d0522e4b 100644
--- a/src/test/run-pass/alt-type-simple.rs
+++ b/src/test/run-pass/alt-type-simple.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn altsimple(any x) {
   alt type (f) {
     case (int i) { print("int"); }
diff --git a/src/test/run-pass/artificial-block.rs b/src/test/run-pass/artificial-block.rs
index a47787e0..30344c4c 100644
--- a/src/test/run-pass/artificial-block.rs
+++ b/src/test/run-pass/artificial-block.rs
@@ -1,6 +1,8 @@
 // xfail-stage0
 // xfail-stage1
 // xfail-stage2
+// xfail-stage1
+// xfail-stage2
 fn f() -> int {
     { ret 3; }
 }
diff --git a/src/test/run-pass/basic-1.rs b/src/test/run-pass/basic-1.rs
index d861e45d..6f9d6267 100644
--- a/src/test/run-pass/basic-1.rs
+++ b/src/test/run-pass/basic-1.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn a(chan[int] c) {
diff --git a/src/test/run-pass/basic-2.rs b/src/test/run-pass/basic-2.rs
index 5bd9e823..5da4945a 100644
--- a/src/test/run-pass/basic-2.rs
+++ b/src/test/run-pass/basic-2.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn a(chan[int] c) {
diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs
index e538d4f2..832eae2f 100644
--- a/src/test/run-pass/basic.rs
+++ b/src/test/run-pass/basic.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn a(chan[int] c) {
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs
index 01ee19af..a9459a47 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/run-pass/child-outlives-parent.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // Reported as issue #126, child leaks the string.
 
 fn child2(str s) {
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs
index 99c319c2..9a75042d 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/run-pass/clone-with-exterior.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn f(@rec(int a, int b) x) {
   assert (x.a == 10);
   assert (x.b == 12);
diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs
index ef93eee6..e28b4f66 100644
--- a/src/test/run-pass/comm.rs
+++ b/src/test/run-pass/comm.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/constrained-type.rs b/src/test/run-pass/constrained-type.rs
index 3c110400..ba79c8e4 100644
--- a/src/test/run-pass/constrained-type.rs
+++ b/src/test/run-pass/constrained-type.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 // Reported as issue #141, as a parse error. Ought to work in full though.
diff --git a/src/test/run-pass/destructor-ordering.rs b/src/test/run-pass/destructor-ordering.rs
index aed38bc2..e8821fbc 100644
--- a/src/test/run-pass/destructor-ordering.rs
+++ b/src/test/run-pass/destructor-ordering.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // This test checks that destructors run in the right order.  Because
 // stateful objects can't have destructors, we have the destructors
 // record their expected order into a channel when they execute (so
diff --git a/src/test/run-pass/iter-ret.rs b/src/test/run-pass/iter-ret.rs
index 6d725061..966234be 100644
--- a/src/test/run-pass/iter-ret.rs
+++ b/src/test/run-pass/iter-ret.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 iter x() -> int {
 }
 
diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs
index a91adaa1..77ab4394 100644
--- a/src/test/run-pass/lazychan.rs
+++ b/src/test/run-pass/lazychan.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/lib-io.rs b/src/test/run-pass/lib-io.rs
index bcc2163c..5c97c2f0 100644
--- a/src/test/run-pass/lib-io.rs
+++ b/src/test/run-pass/lib-io.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-rand.rs b/src/test/run-pass/lib-rand.rs
index 62d94dc4..3ef94973 100644
--- a/src/test/run-pass/lib-rand.rs
+++ b/src/test/run-pass/lib-rand.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-str-buf.rs b/src/test/run-pass/lib-str-buf.rs
index 9b8c56bb..1f25373a 100644
--- a/src/test/run-pass/lib-str-buf.rs
+++ b/src/test/run-pass/lib-str-buf.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs
index 5b67fdc6..d9c9779f 100644
--- a/src/test/run-pass/many.rs
+++ b/src/test/run-pass/many.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn sub(chan[int] parent, int id) {
diff --git a/src/test/run-pass/mlist-cycle.rs b/src/test/run-pass/mlist-cycle.rs
index 05056592..7c41e4b5 100644
--- a/src/test/run-pass/mlist-cycle.rs
+++ b/src/test/run-pass/mlist-cycle.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/mlist.rs b/src/test/run-pass/mlist.rs
index 6fc45d7c..eefeb399 100644
--- a/src/test/run-pass/mlist.rs
+++ b/src/test/run-pass/mlist.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 tag mlist {
diff --git a/src/test/run-pass/multi.rc b/src/test/run-pass/multi.rc
index ad08db6b..53280d5f 100644
--- a/src/test/run-pass/multi.rc
+++ b/src/test/run-pass/multi.rc
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 mod multi = "multi-src" {
 
   mod foo; // implicitly = "foo.rs"
diff --git a/src/test/run-pass/native-mod.rc b/src/test/run-pass/native-mod.rc
index 17925c79..c805f5f9 100644
--- a/src/test/run-pass/native-mod.rc
+++ b/src/test/run-pass/native-mod.rc
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 native mod libc = target_libc {
diff --git a/src/test/run-pass/native.rc b/src/test/run-pass/native.rc
index 89556096..386f417c 100644
--- a/src/test/run-pass/native.rc
+++ b/src/test/run-pass/native.rc
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 native "rust" mod rustrt {
diff --git a/src/test/run-pass/obj-as.rs b/src/test/run-pass/obj-as.rs
index 28868548..bbc37a97 100644
--- a/src/test/run-pass/obj-as.rs
+++ b/src/test/run-pass/obj-as.rs
@@ -1,6 +1,8 @@
 // xfail-boot
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 
 obj big() {
   fn one() -> int { ret 1; }
diff --git a/src/test/run-pass/obj-dtor.rs b/src/test/run-pass/obj-dtor.rs
index 62e0de87..61627827 100644
--- a/src/test/run-pass/obj-dtor.rs
+++ b/src/test/run-pass/obj-dtor.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 obj worker(chan[int] c) {
   drop {
     log "in dtor";
diff --git a/src/test/run-pass/pred.rs b/src/test/run-pass/pred.rs
index c2bea010..022e1fc4 100644
--- a/src/test/run-pass/pred.rs
+++ b/src/test/run-pass/pred.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn f(int a, int b) : lt(a,b) {
diff --git a/src/test/run-pass/preempt.rs b/src/test/run-pass/preempt.rs
index cbbe1a0a..50520406 100644
--- a/src/test/run-pass/preempt.rs
+++ b/src/test/run-pass/preempt.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // This checks that preemption works.
 
 fn starve_main(chan[int] alive) {
diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/run-pass/spawn-fn.rs
index ea069e31..0cb16b93 100644
--- a/src/test/run-pass/spawn-fn.rs
+++ b/src/test/run-pass/spawn-fn.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn x(str s, int n) {
diff --git a/src/test/run-pass/spawn-module-qualified.rs b/src/test/run-pass/spawn-module-qualified.rs
index 833e246a..9f95ec95 100644
--- a/src/test/run-pass/spawn-module-qualified.rs
+++ b/src/test/run-pass/spawn-module-qualified.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() {
   auto x = spawn m.child(10);
   join x;
diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs
index 5dd758ba..ba554fda 100644
--- a/src/test/run-pass/spawn.rs
+++ b/src/test/run-pass/spawn.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/syntax-extension-fmt.rs b/src/test/run-pass/syntax-extension-fmt.rs
index 5248e782..bb0c851f 100644
--- a/src/test/run-pass/syntax-extension-fmt.rs
+++ b/src/test/run-pass/syntax-extension-fmt.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 use std;
 import std._str;
 
diff --git a/src/test/run-pass/syntax-extension-shell.rs b/src/test/run-pass/syntax-extension-shell.rs
index f48a1b81..62553281 100644
--- a/src/test/run-pass/syntax-extension-shell.rs
+++ b/src/test/run-pass/syntax-extension-shell.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 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 54e37a34..cf968cb9 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
     test05();
 }
diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/run-pass/task-comm-1.rs
index 61613a20..c8ebdd19 100644
--- a/src/test/run-pass/task-comm-1.rs
+++ b/src/test/run-pass/task-comm-1.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
    test00(); 
 }
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index 3c504ea7..fcb32fd1 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn start(chan[chan[str]] c) {
     let port[str] p = port();
     c <| chan(p);
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs
index 239e7933..011b65ca 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn start(chan[chan[str]] c) {
     let port[str] p = port();
     c <| chan(p);
diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs
index 5d89b5d3..2f8ef985 100644
--- a/src/test/run-pass/task-comm-12.rs
+++ b/src/test/run-pass/task-comm-12.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 use std;
 import std._task;
 
diff --git a/src/test/run-pass/task-comm-13-thread.rs b/src/test/run-pass/task-comm-13-thread.rs
index 1ad8ac7a..e5e42010 100644
--- a/src/test/run-pass/task-comm-13-thread.rs
+++ b/src/test/run-pass/task-comm-13-thread.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 use std;
 import std._task;
 
diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs
index ee612ca0..bcae26e5 100644
--- a/src/test/run-pass/task-comm-13.rs
+++ b/src/test/run-pass/task-comm-13.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 use std;
 import std._task;
 
diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs
index 197c6005..ee3a0624 100644
--- a/src/test/run-pass/task-comm-15.rs
+++ b/src/test/run-pass/task-comm-15.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn start(chan[int] c, int n) {
     let int i = n;
 
diff --git a/src/test/run-pass/task-comm-2.rs b/src/test/run-pass/task-comm-2.rs
index a6fc9115..9d7c2cc5 100644
--- a/src/test/run-pass/task-comm-2.rs
+++ b/src/test/run-pass/task-comm-2.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {    
     log "===== SPAWNING and JOINING TASKS =====";
     test00(false);
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index 59c46c4c..27f01227 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
    log "===== WITHOUT THREADS =====";
    test00(false);
diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs
index f9fbab88..e236f69e 100644
--- a/src/test/run-pass/task-comm-7.rs
+++ b/src/test/run-pass/task-comm-7.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
    test00();
 }
diff --git a/src/test/run-pass/task-comm-8.rs b/src/test/run-pass/task-comm-8.rs
index d115ac40..b4493e20 100644
--- a/src/test/run-pass/task-comm-8.rs
+++ b/src/test/run-pass/task-comm-8.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
    test00();
 }
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs
index c1c8a3bd..429592ba 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/run-pass/task-comm-9.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
    test00();
 }
diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs
index d256ced9..74faa149 100644
--- a/src/test/run-pass/task-comm.rs
+++ b/src/test/run-pass/task-comm.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 
 fn main() -> () {
     test00(true);
diff --git a/src/test/run-pass/task-killjoin.rs b/src/test/run-pass/task-killjoin.rs
index 6a9f272f..a0deacef 100644
--- a/src/test/run-pass/task-killjoin.rs
+++ b/src/test/run-pass/task-killjoin.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // Create a task that is supervised by another task,
 // join the supervised task from the supervising task,
 // then fail the supervised task. The supervised task
diff --git a/src/test/run-pass/task-life-0.rs b/src/test/run-pass/task-life-0.rs
index 567f63a9..70d0aea2 100644
--- a/src/test/run-pass/task-life-0.rs
+++ b/src/test/run-pass/task-life-0.rs
@@ -1,5 +1,7 @@
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() -> () {
     spawn child("Hello");
 }
diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs
index 3b6d8c0b..4dd87e9c 100644
--- a/src/test/run-pass/threads.rs
+++ b/src/test/run-pass/threads.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index 1903cb76..e416e9b5 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 
 import size_of = std.sys.rustrt.size_of;
 
diff --git a/src/test/run-pass/use-import-export.rs b/src/test/run-pass/use-import-export.rs
index 51495931..3e047149 100644
--- a/src/test/run-pass/use-import-export.rs
+++ b/src/test/run-pass/use-import-export.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 
 mod foo {
   export x;
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index a71957f2..37cfe074 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 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 b8a8144c..679d3e48 100644
--- a/src/test/run-pass/user.rs
+++ b/src/test/run-pass/user.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 use std (name = "std",
diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs
index bf758a49..d23f9805 100644
--- a/src/test/run-pass/utf8.rs
+++ b/src/test/run-pass/utf8.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() {
   let char yen = '¥';         // 0xa5
   let char c_cedilla = 'ç';   // 0xe7
diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs
index 07eaca19..e2df05dc 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/run-pass/utf8_chars.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 use std;
 import std._str;
 import std._vec;
diff --git a/src/test/run-pass/vec-alloc-append.rs b/src/test/run-pass/vec-alloc-append.rs
index 83d58d73..616823ae 100644
--- a/src/test/run-pass/vec-alloc-append.rs
+++ b/src/test/run-pass/vec-alloc-append.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // This is a test for issue #109.
 
 use std;
diff --git a/src/test/run-pass/vec-append.rs b/src/test/run-pass/vec-append.rs
index 69db4788..e63b1d09 100644
--- a/src/test/run-pass/vec-append.rs
+++ b/src/test/run-pass/vec-append.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs
index c3042d0c..1559ca38 100644
--- a/src/test/run-pass/vec-slice.rs
+++ b/src/test/run-pass/vec-slice.rs
@@ -1,6 +1,8 @@
 // xfail-boot
 // xfail-boot
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 fn main() {
   let vec[int] v = vec(1,2,3,4,5);
   auto v2 = v.(1,2);
diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs
index 7b931afb..bc391463 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/run-pass/yield.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/yield2.rs b/src/test/run-pass/yield2.rs
index f1a54341..4c824d6d 100644
--- a/src/test/run-pass/yield2.rs
+++ b/src/test/run-pass/yield2.rs
@@ -1,4 +1,6 @@
 // xfail-stage0
+// xfail-stage1
+// xfail-stage2
 // -*- rust -*-
 
 fn main() {