Switch xfail system to use comments embedded in source files.

161 files changed, 189 insertions, 0 deletions

diff --git a/src/test/bench/99-bottles/99bob-iter.rs b/src/test/bench/99-bottles/99bob-iter.rs
index 09638941..e43541f4 100644
--- a/src/test/bench/99-bottles/99bob-iter.rs
+++ b/src/test/bench/99-bottles/99bob-iter.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 /* -*- mode:rust;indent-tabs-mode:nil -*- 
  * Implementation of 99 Bottles of Beer
  * http://99-bottles-of-beer.net/
diff --git a/src/test/bench/99-bottles/99bob-pattern.rs b/src/test/bench/99-bottles/99bob-pattern.rs
index 58d2d2c3..539f8152 100644
--- a/src/test/bench/99-bottles/99bob-pattern.rs
+++ b/src/test/bench/99-bottles/99bob-pattern.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 /* -*- mode:rust;indent-tabs-mode:nil -*- 
  * Implementation of 99 Bottles of Beer
  * http://99-bottles-of-beer.net/
diff --git a/src/test/bench/99-bottles/99bob-simple.rs b/src/test/bench/99-bottles/99bob-simple.rs
index 3c426f51..d5adf102 100644
--- a/src/test/bench/99-bottles/99bob-simple.rs
+++ b/src/test/bench/99-bottles/99bob-simple.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 /* -*- mode:rust;indent-tabs-mode:nil -*- 
  * Implementation of 99 Bottles of Beer
  * http://99-bottles-of-beer.net/
diff --git a/src/test/bench/99-bottles/99bob-tail.rs b/src/test/bench/99-bottles/99bob-tail.rs
index 16e66d33..41e2c536 100644
--- a/src/test/bench/99-bottles/99bob-tail.rs
+++ b/src/test/bench/99-bottles/99bob-tail.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 /* -*- mode:rust;indent-tabs-mode:nil -*- 
  * Implementation of 99 Bottles of Beer
  * http://99-bottles-of-beer.net/
diff --git a/src/test/bench/shootout/binarytrees.rs b/src/test/bench/shootout/binarytrees.rs
index 92bedb8b..0fc7ced4 100644
--- a/src/test/bench/shootout/binarytrees.rs
+++ b/src/test/bench/shootout/binarytrees.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 
 import std._int;
diff --git a/src/test/bench/shootout/fannkuchredux.rs b/src/test/bench/shootout/fannkuchredux.rs
index 2d44067b..65f6bdb2 100644
--- a/src/test/bench/shootout/fannkuchredux.rs
+++ b/src/test/bench/shootout/fannkuchredux.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // Based on Isaac Gouy's fannkuchredux.csharp
 
 use std;
diff --git a/src/test/bench/shootout/fasta.rs b/src/test/bench/shootout/fasta.rs
index f88f4330..82d65e84 100644
--- a/src/test/bench/shootout/fasta.rs
+++ b/src/test/bench/shootout/fasta.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 /* -*- mode: rust; indent-tabs-mode: nil -*-
  * Implementation of 'fasta' benchmark from
  * Computer Language Benchmarks Game
diff --git a/src/test/bench/shootout/nbody.rs b/src/test/bench/shootout/nbody.rs
index b0ac2d44..5d9e304a 100644
--- a/src/test/bench/shootout/nbody.rs
+++ b/src/test/bench/shootout/nbody.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // based on:
 // http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
 
diff --git a/src/test/compile-fail/bad-alt.rs b/src/test/compile-fail/bad-alt.rs
index f2582879..0b5dbbfe 100644
--- a/src/test/compile-fail/bad-alt.rs
+++ b/src/test/compile-fail/bad-alt.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 013bb56e..8e30ac44 100644
--- a/src/test/compile-fail/bad-env-capture.rs
+++ b/src/test/compile-fail/bad-env-capture.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: attempted dynamic environment-capture
 fn foo() {
   let int x;
diff --git a/src/test/compile-fail/bad-expr-path.rs b/src/test/compile-fail/bad-expr-path.rs
index 97c95c01..01e27c5a 100644
--- a/src/test/compile-fail/bad-expr-path.rs
+++ b/src/test/compile-fail/bad-expr-path.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // error-pattern: unresolved name: a
 
 mod m1 {
diff --git a/src/test/compile-fail/bad-main.rs b/src/test/compile-fail/bad-main.rs
index 8e3fa503..d1a5203f 100644
--- a/src/test/compile-fail/bad-main.rs
+++ b/src/test/compile-fail/bad-main.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 44a30219..99324ce1 100644
--- a/src/test/compile-fail/bad-name.rs
+++ b/src/test/compile-fail/bad-name.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 
 // error-pattern: malformed name
 
diff --git a/src/test/compile-fail/bad-recv.rs b/src/test/compile-fail/bad-recv.rs
index cccb735d..031d1059 100644
--- a/src/test/compile-fail/bad-recv.rs
+++ b/src/test/compile-fail/bad-recv.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // 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 e699b4e3..4a97539f 100644
--- a/src/test/compile-fail/bad-send.rs
+++ b/src/test/compile-fail/bad-send.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // 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 e18e63a7..53b96278 100644
--- a/src/test/compile-fail/bad-type-env-capture.rs
+++ b/src/test/compile-fail/bad-type-env-capture.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 b2f53252..7d85d07f 100644
--- a/src/test/compile-fail/bind-alias.rs
+++ b/src/test/compile-fail/bind-alias.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: binding alias slot
 
 fn f(&int x) {}
diff --git a/src/test/compile-fail/comm-makes-io.rs b/src/test/compile-fail/comm-makes-io.rs
index 57a8e6e8..4a0f704a 100644
--- a/src/test/compile-fail/comm-makes-io.rs
+++ b/src/test/compile-fail/comm-makes-io.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: calculated effect is 'impure'
 
 fn main() {
diff --git a/src/test/compile-fail/constructor-as-cast.rs b/src/test/compile-fail/constructor-as-cast.rs
index 2374cd2c..6d81b693 100644
--- a/src/test/compile-fail/constructor-as-cast.rs
+++ b/src/test/compile-fail/constructor-as-cast.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 af1456a4..5a069c5a 100644
--- a/src/test/compile-fail/dead-code-be.rs
+++ b/src/test/compile-fail/dead-code-be.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 4c52fcaa..c992e4e5 100644
--- a/src/test/compile-fail/dead-code-ret.rs
+++ b/src/test/compile-fail/dead-code-ret.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 fa067725..e4184ccd 100644
--- a/src/test/compile-fail/direct-obj-fn-call.rs
+++ b/src/test/compile-fail/direct-obj-fn-call.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 
 // 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 805d3142..e6680193 100644
--- a/src/test/compile-fail/does-nothing.rs
+++ b/src/test/compile-fail/does-nothing.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: does nothing
 fn main() {
   log "doing";
diff --git a/src/test/compile-fail/export.rs b/src/test/compile-fail/export.rs
index 7a00f221..84e87c2e 100644
--- a/src/test/compile-fail/export.rs
+++ b/src/test/compile-fail/export.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: unknown module item
 mod foo {
   export x;
diff --git a/src/test/compile-fail/fru-typestate.rs b/src/test/compile-fail/fru-typestate.rs
index 86c68e5b..74fcdb26 100644
--- a/src/test/compile-fail/fru-typestate.rs
+++ b/src/test/compile-fail/fru-typestate.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern: precondition
diff --git a/src/test/compile-fail/import.rs b/src/test/compile-fail/import.rs
index 71ef0dec..db1eac5c 100644
--- a/src/test/compile-fail/import.rs
+++ b/src/test/compile-fail/import.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // error-pattern: unresolved name: baz
 import zed.bar;
 import zed.baz;
diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs
index 5a9ddcbd..91d2ade3 100644
--- a/src/test/compile-fail/import2.rs
+++ b/src/test/compile-fail/import2.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // error-pattern: unresolved name: zed
 import baz.zed.bar;
 mod baz {
diff --git a/src/test/compile-fail/import3.rs b/src/test/compile-fail/import3.rs
index 16aa43ea..eede7626 100644
--- a/src/test/compile-fail/import3.rs
+++ b/src/test/compile-fail/import3.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // error-pattern: main is not a module or crate
 import main.bar;
 
diff --git a/src/test/compile-fail/import4.rs b/src/test/compile-fail/import4.rs
index 3e1208f5..bbef8d53 100644
--- a/src/test/compile-fail/import4.rs
+++ b/src/test/compile-fail/import4.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // error-pattern: cyclic import
 
 import zed.bar;
diff --git a/src/test/compile-fail/impure-pred.rs b/src/test/compile-fail/impure-pred.rs
index c322850b..17a651ca 100644
--- a/src/test/compile-fail/impure-pred.rs
+++ b/src/test/compile-fail/impure-pred.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern: impure function used in constraint
diff --git a/src/test/compile-fail/infinite-tag-type-recursion.rs b/src/test/compile-fail/infinite-tag-type-recursion.rs
index 17f8f594..8ba0e25b 100644
--- a/src/test/compile-fail/infinite-tag-type-recursion.rs
+++ b/src/test/compile-fail/infinite-tag-type-recursion.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 9315488b..4534f119 100644
--- a/src/test/compile-fail/infinite-vec-type-recursion.rs
+++ b/src/test/compile-fail/infinite-vec-type-recursion.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern: infinite recursive type definition
diff --git a/src/test/compile-fail/io-infects-caller.rs b/src/test/compile-fail/io-infects-caller.rs
index b07f46e6..5e8281c5 100644
--- a/src/test/compile-fail/io-infects-caller.rs
+++ b/src/test/compile-fail/io-infects-caller.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: calculated effect is 'impure'
 
 impure fn foo() {
diff --git a/src/test/compile-fail/item-name-overload.rs b/src/test/compile-fail/item-name-overload.rs
index f0f585f5..5cff8b98 100644
--- a/src/test/compile-fail/item-name-overload.rs
+++ b/src/test/compile-fail/item-name-overload.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern: name
diff --git a/src/test/compile-fail/missing-return.rs b/src/test/compile-fail/missing-return.rs
index 34fb4105..4c73a4fd 100644
--- a/src/test/compile-fail/missing-return.rs
+++ b/src/test/compile-fail/missing-return.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: return
 
 fn f() -> int {
diff --git a/src/test/compile-fail/native-makes-unsafe.rs b/src/test/compile-fail/native-makes-unsafe.rs
index d6e77b0d..d158f563 100644
--- a/src/test/compile-fail/native-makes-unsafe.rs
+++ b/src/test/compile-fail/native-makes-unsafe.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: calculated effect is 'unsafe'
 
 native mod foo {
diff --git a/src/test/compile-fail/no-self-dispatch.rs b/src/test/compile-fail/no-self-dispatch.rs
index be90c12f..96089e67 100644
--- a/src/test/compile-fail/no-self-dispatch.rs
+++ b/src/test/compile-fail/no-self-dispatch.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 4a899512..c599f3bc 100644
--- a/src/test/compile-fail/not-a-pred.rs
+++ b/src/test/compile-fail/not-a-pred.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 cf31b8bd..7106df5c 100644
--- a/src/test/compile-fail/pred-on-wrong-slots.rs
+++ b/src/test/compile-fail/pred-on-wrong-slots.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 9f704bc3..22882ff2 100644
--- a/src/test/compile-fail/put-in-fn.rs
+++ b/src/test/compile-fail/put-in-fn.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: iterator function
 
 fn f() -> int {
diff --git a/src/test/compile-fail/return-uninit.rs b/src/test/compile-fail/return-uninit.rs
index 37117169..047db518 100644
--- a/src/test/compile-fail/return-uninit.rs
+++ b/src/test/compile-fail/return-uninit.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: precondition constraint
 
 fn f() -> int {
diff --git a/src/test/compile-fail/slot-as-pred.rs b/src/test/compile-fail/slot-as-pred.rs
index 1da8df84..2ba4a30c 100644
--- a/src/test/compile-fail/slot-as-pred.rs
+++ b/src/test/compile-fail/slot-as-pred.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 4d869bba..bd7d7d9f 100644
--- a/src/test/compile-fail/spawn-non-nil-fn.rs
+++ b/src/test/compile-fail/spawn-non-nil-fn.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: mismatched types
 
 fn f(int x) -> int {
diff --git a/src/test/compile-fail/tail-non-call.rs b/src/test/compile-fail/tail-non-call.rs
index 00a451f6..e2dbc381 100644
--- a/src/test/compile-fail/tail-non-call.rs
+++ b/src/test/compile-fail/tail-non-call.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // error-pattern: Non-call expression in tail call
 
 fn f() -> int {
diff --git a/src/test/compile-fail/unbalanced-comment.rs b/src/test/compile-fail/unbalanced-comment.rs
index a1916fdc..f49e7447 100644
--- a/src/test/compile-fail/unbalanced-comment.rs
+++ b/src/test/compile-fail/unbalanced-comment.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern: token
diff --git a/src/test/compile-fail/unnecessary-io.rs b/src/test/compile-fail/unnecessary-io.rs
index fb50a54c..64784661 100644
--- a/src/test/compile-fail/unnecessary-io.rs
+++ b/src/test/compile-fail/unnecessary-io.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: calculated effect is ''
 impure fn main() {
   log "hi";
diff --git a/src/test/compile-fail/unnecessary-unsafe.rs b/src/test/compile-fail/unnecessary-unsafe.rs
index 6705bf34..9d48f164 100644
--- a/src/test/compile-fail/unnecessary-unsafe.rs
+++ b/src/test/compile-fail/unnecessary-unsafe.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: calculated effect is ''
 unsafe fn main() {
   log "hi";
diff --git a/src/test/compile-fail/unsafe-infects-caller.rs b/src/test/compile-fail/unsafe-infects-caller.rs
index 28daea6c..532024e5 100644
--- a/src/test/compile-fail/unsafe-infects-caller.rs
+++ b/src/test/compile-fail/unsafe-infects-caller.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: calculated effect is 'unsafe'
 
 native mod foo {
diff --git a/src/test/compile-fail/use-uninit-2.rs b/src/test/compile-fail/use-uninit-2.rs
index 79cebe28..c77676b8 100644
--- a/src/test/compile-fail/use-uninit-2.rs
+++ b/src/test/compile-fail/use-uninit-2.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern:Unsatisfied precondition
 
 fn foo(int x) {
diff --git a/src/test/compile-fail/use-uninit-3.rs b/src/test/compile-fail/use-uninit-3.rs
index e6545451..5dd3926b 100644
--- a/src/test/compile-fail/use-uninit-3.rs
+++ b/src/test/compile-fail/use-uninit-3.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern:Unsatisfied precondition
 
 fn foo(int x) {
diff --git a/src/test/compile-fail/use-uninit.rs b/src/test/compile-fail/use-uninit.rs
index 03dafdcc..bd2e9f41 100644
--- a/src/test/compile-fail/use-uninit.rs
+++ b/src/test/compile-fail/use-uninit.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern:Unsatisfied precondition
 
 fn foo(int x) {
diff --git a/src/test/compile-fail/while-bypass.rs b/src/test/compile-fail/while-bypass.rs
index 1de89e90..b49152b3 100644
--- a/src/test/compile-fail/while-bypass.rs
+++ b/src/test/compile-fail/while-bypass.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: precondition constraint
 
 fn f() -> int {
diff --git a/src/test/compile-fail/while-expr.rs b/src/test/compile-fail/while-expr.rs
index 9077c18f..295752f8 100644
--- a/src/test/compile-fail/while-expr.rs
+++ b/src/test/compile-fail/while-expr.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: precondition constraint
 
 fn main() {
diff --git a/src/test/compile-fail/writing-through-read-alias.rs b/src/test/compile-fail/writing-through-read-alias.rs
index 2a8ec11e..373c6082 100644
--- a/src/test/compile-fail/writing-through-read-alias.rs
+++ b/src/test/compile-fail/writing-through-read-alias.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern: writing to immutable type
diff --git a/src/test/compile-fail/writing-through-uninit-vec.rs b/src/test/compile-fail/writing-through-uninit-vec.rs
index 55edbf87..7757609d 100644
--- a/src/test/compile-fail/writing-through-uninit-vec.rs
+++ b/src/test/compile-fail/writing-through-uninit-vec.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern: Unsatisfied precondition constraint
 
 fn test() {
diff --git a/src/test/compile-fail/writing-to-immutable-obj.rs b/src/test/compile-fail/writing-to-immutable-obj.rs
index ffa2cebe..563fc9cd 100644
--- a/src/test/compile-fail/writing-to-immutable-obj.rs
+++ b/src/test/compile-fail/writing-to-immutable-obj.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 42206fe4..8e94dfd9 100644
--- a/src/test/compile-fail/writing-to-immutable-rec.rs
+++ b/src/test/compile-fail/writing-to-immutable-rec.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 bd974dcc..e05aa55b 100644
--- a/src/test/compile-fail/writing-to-immutable-tup.rs
+++ b/src/test/compile-fail/writing-to-immutable-tup.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 341037c3..dac122b8 100644
--- a/src/test/compile-fail/writing-to-immutable-vec.rs
+++ b/src/test/compile-fail/writing-to-immutable-vec.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 cb0e37e5..3ab821d5 100644
--- a/src/test/run-fail/explicit-fail.rs
+++ b/src/test/run-fail/explicit-fail.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // error-pattern:explicit
 
 fn main() {
diff --git a/src/test/run-fail/fail.rs b/src/test/run-fail/fail.rs
index 8808b8c8..e8c9cf71 100644
--- a/src/test/run-fail/fail.rs
+++ b/src/test/run-fail/fail.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 4990f33c..df8b49d6 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 eb533ef3..85418022 100644
--- a/src/test/run-fail/non-exhaustive-match.rs
+++ b/src/test/run-fail/non-exhaustive-match.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern:non-exhaustive match failure
diff --git a/src/test/run-fail/pred.rs b/src/test/run-fail/pred.rs
index e5456a5e..d4430703 100644
--- a/src/test/run-fail/pred.rs
+++ b/src/test/run-fail/pred.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern:predicate check
diff --git a/src/test/run-fail/str-overrun.rs b/src/test/run-fail/str-overrun.rs
index cd455fb4..4388cb3a 100644
--- a/src/test/run-fail/str-overrun.rs
+++ b/src/test/run-fail/str-overrun.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 786f7428..b56723c2 100644
--- a/src/test/run-fail/task-comm-14.rs
+++ b/src/test/run-fail/task-comm-14.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 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 e646a107..961da730 100644
--- a/src/test/run-fail/vec-overrun.rs
+++ b/src/test/run-fail/vec-overrun.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-fail/vec-underrun.rs b/src/test/run-fail/vec-underrun.rs
index c9073030..a230d1be 100644
--- a/src/test/run-fail/vec-underrun.rs
+++ b/src/test/run-fail/vec-underrun.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // error-pattern:bounds check
diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs
index 27cffad4..4df67c9b 100644
--- a/src/test/run-pass/acyclic-unwind.rs
+++ b/src/test/run-pass/acyclic-unwind.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 impure fn f(chan[int] c)
diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/alt-pattern-drop.rs
index 4ee2c12b..d3c62485 100644
--- a/src/test/run-pass/alt-pattern-drop.rs
+++ b/src/test/run-pass/alt-pattern-drop.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/alt-type-simple.rs b/src/test/run-pass/alt-type-simple.rs
index 85f6ff68..62193866 100644
--- a/src/test/run-pass/alt-type-simple.rs
+++ b/src/test/run-pass/alt-type-simple.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 fn altsimple(any x) {
   alt type (f) {
     case (int i) { print("int"); }
diff --git a/src/test/run-pass/arith-unsigned.rs b/src/test/run-pass/arith-unsigned.rs
index 3fac3714..748ff6b7 100644
--- a/src/test/run-pass/arith-unsigned.rs
+++ b/src/test/run-pass/arith-unsigned.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // Unsigned integer operations
 
 fn main() {
diff --git a/src/test/run-pass/basic-1.rs b/src/test/run-pass/basic-1.rs
index f61bf895..5697eea4 100644
--- a/src/test/run-pass/basic-1.rs
+++ b/src/test/run-pass/basic-1.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 impure fn a(chan[int] c) {
diff --git a/src/test/run-pass/basic-2.rs b/src/test/run-pass/basic-2.rs
index d2b2e240..d7336684 100644
--- a/src/test/run-pass/basic-2.rs
+++ b/src/test/run-pass/basic-2.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 impure fn a(chan[int] c) {
diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs
index a92247c9..7495f037 100644
--- a/src/test/run-pass/basic.rs
+++ b/src/test/run-pass/basic.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 impure fn a(chan[int] c) {
diff --git a/src/test/run-pass/box-compare.rs b/src/test/run-pass/box-compare.rs
index 5115d510..619790d7 100644
--- a/src/test/run-pass/box-compare.rs
+++ b/src/test/run-pass/box-compare.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
   check (@1 < @3);
   check (@@"hello " > @@"hello");
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs
index d7d7c344..01ee19af 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/run-pass/child-outlives-parent.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // 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 7de90425..e97c409d 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/run-pass/clone-with-exterior.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 fn f(@rec(int a, int b) x) {
   check (x.a == 10);
   check (x.b == 12);
diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs
index a6610d57..93ccacfc 100644
--- a/src/test/run-pass/comm.rs
+++ b/src/test/run-pass/comm.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 impure fn main() {
diff --git a/src/test/run-pass/constrained-type.rs b/src/test/run-pass/constrained-type.rs
index 1fc6f49a..3c110400 100644
--- a/src/test/run-pass/constrained-type.rs
+++ b/src/test/run-pass/constrained-type.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- 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 f7f5b8c8..aed38bc2 100644
--- a/src/test/run-pass/destructor-ordering.rs
+++ b/src/test/run-pass/destructor-ordering.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // 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/empty-mutable-vec.rs b/src/test/run-pass/empty-mutable-vec.rs
index a972fda4..237805ca 100644
--- a/src/test/run-pass/empty-mutable-vec.rs
+++ b/src/test/run-pass/empty-mutable-vec.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
     let vec[mutable int] v = vec(mutable);
 }
diff --git a/src/test/run-pass/float-signature.rs b/src/test/run-pass/float-signature.rs
index da18390d..55c42a6e 100644
--- a/src/test/run-pass/float-signature.rs
+++ b/src/test/run-pass/float-signature.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
     fn foo(float n) -> float {
         ret n + 0.12345;
diff --git a/src/test/run-pass/float.rs b/src/test/run-pass/float.rs
index dad2f6d8..950271fb 100644
--- a/src/test/run-pass/float.rs
+++ b/src/test/run-pass/float.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
   auto pi = 3.1415927;
 
diff --git a/src/test/run-pass/float2.rs b/src/test/run-pass/float2.rs
index 0c111ba9..9cc3a8ca 100644
--- a/src/test/run-pass/float2.rs
+++ b/src/test/run-pass/float2.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
   auto a = 1.5e6;
   auto b = 1.5E6;
diff --git a/src/test/run-pass/floatlits.rs b/src/test/run-pass/floatlits.rs
index db82b486..10b0fb77 100644
--- a/src/test/run-pass/floatlits.rs
+++ b/src/test/run-pass/floatlits.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
   auto f = 4.999999999999;
   check (f > 4.90);
diff --git a/src/test/run-pass/fn-lval.rs b/src/test/run-pass/fn-lval.rs
index de0d3f48..4223e022 100644
--- a/src/test/run-pass/fn-lval.rs
+++ b/src/test/run-pass/fn-lval.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // -*- rust -*-
 
 fn foo((fn(int) -> int) f) {}
diff --git a/src/test/run-pass/generic-bind-2.rs b/src/test/run-pass/generic-bind-2.rs
index 95a8cab4..3975867a 100644
--- a/src/test/run-pass/generic-bind-2.rs
+++ b/src/test/run-pass/generic-bind-2.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn id[T](&T t) -> T {
   ret t;
 }
diff --git a/src/test/run-pass/generic-fn-box.rs b/src/test/run-pass/generic-fn-box.rs
index e821a784..1092ea8b 100644
--- a/src/test/run-pass/generic-fn-box.rs
+++ b/src/test/run-pass/generic-fn-box.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn f[T](@T x) -> @T {
     ret x;
 }
diff --git a/src/test/run-pass/generic-tag.rs b/src/test/run-pass/generic-tag.rs
index 68d7c18f..12a813e3 100644
--- a/src/test/run-pass/generic-tag.rs
+++ b/src/test/run-pass/generic-tag.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 tag option[T] {
   some(@T);
   none;
diff --git a/src/test/run-pass/generic-tup.rs b/src/test/run-pass/generic-tup.rs
index 29a66371..c387ef19 100644
--- a/src/test/run-pass/generic-tup.rs
+++ b/src/test/run-pass/generic-tup.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 
 fn get_third[T](&tup(T,T,T) t) -> T {
   ret t._2;
diff --git a/src/test/run-pass/iter-ret.rs b/src/test/run-pass/iter-ret.rs
index 12eb9b4e..6d725061 100644
--- a/src/test/run-pass/iter-ret.rs
+++ b/src/test/run-pass/iter-ret.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 iter x() -> int {
 }
 
diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs
index b5bf8872..adc14434 100644
--- a/src/test/run-pass/lazychan.rs
+++ b/src/test/run-pass/lazychan.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 impure fn main() {
diff --git a/src/test/run-pass/leak-tag-copy.rs b/src/test/run-pass/leak-tag-copy.rs
index 25d87c6e..5a4ead33 100644
--- a/src/test/run-pass/leak-tag-copy.rs
+++ b/src/test/run-pass/leak-tag-copy.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 tag t {
   a;
   b(@int);
diff --git a/src/test/run-pass/lib-bitv.rs b/src/test/run-pass/lib-bitv.rs
index c3ffa8ea..3bd5a03a 100644
--- a/src/test/run-pass/lib-bitv.rs
+++ b/src/test/run-pass/lib-bitv.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 import std._vec;
 import std.bitv;
diff --git a/src/test/run-pass/lib-deque.rs b/src/test/run-pass/lib-deque.rs
index ab45b397..b51ff241 100644
--- a/src/test/run-pass/lib-deque.rs
+++ b/src/test/run-pass/lib-deque.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-int.rs b/src/test/run-pass/lib-int.rs
index 2e85abf6..9fd127ef 100644
--- a/src/test/run-pass/lib-int.rs
+++ b/src/test/run-pass/lib-int.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 
 import std._int;
diff --git a/src/test/run-pass/lib-io.rs b/src/test/run-pass/lib-io.rs
index 0c0bcdcd..aab6713f 100644
--- a/src/test/run-pass/lib-io.rs
+++ b/src/test/run-pass/lib-io.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-map.rs b/src/test/run-pass/lib-map.rs
index 0ae8cc6b..319c8a9b 100644
--- a/src/test/run-pass/lib-map.rs
+++ b/src/test/run-pass/lib-map.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-rand.rs b/src/test/run-pass/lib-rand.rs
index df227f66..62d94dc4 100644
--- a/src/test/run-pass/lib-rand.rs
+++ b/src/test/run-pass/lib-rand.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-sha1.rs b/src/test/run-pass/lib-sha1.rs
index 57e3cdc8..82c497c8 100644
--- a/src/test/run-pass/lib-sha1.rs
+++ b/src/test/run-pass/lib-sha1.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-sort.rs b/src/test/run-pass/lib-sort.rs
index e2c3465c..f6076e58 100644
--- a/src/test/run-pass/lib-sort.rs
+++ b/src/test/run-pass/lib-sort.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 
 fn check_sort(vec[int] v1, vec[int] v2) {
diff --git a/src/test/run-pass/lib-str-buf.rs b/src/test/run-pass/lib-str-buf.rs
index 7ba19e92..bd5cb036 100644
--- a/src/test/run-pass/lib-str-buf.rs
+++ b/src/test/run-pass/lib-str-buf.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-str.rs b/src/test/run-pass/lib-str.rs
index f3552aad..52f0f51b 100644
--- a/src/test/run-pass/lib-str.rs
+++ b/src/test/run-pass/lib-str.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 import std._str;
 
diff --git a/src/test/run-pass/lib-task.rs b/src/test/run-pass/lib-task.rs
index 18499f4e..06e9182c 100644
--- a/src/test/run-pass/lib-task.rs
+++ b/src/test/run-pass/lib-task.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 import std._task;
 
diff --git a/src/test/run-pass/lib-uint.rs b/src/test/run-pass/lib-uint.rs
index 356ca374..98d37550 100644
--- a/src/test/run-pass/lib-uint.rs
+++ b/src/test/run-pass/lib-uint.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-vec-str-conversions.rs b/src/test/run-pass/lib-vec-str-conversions.rs
index 1d6b61a1..b8da0777 100644
--- a/src/test/run-pass/lib-vec-str-conversions.rs
+++ b/src/test/run-pass/lib-vec-str-conversions.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/lib-vec.rs b/src/test/run-pass/lib-vec.rs
index 4d616648..6fde06ad 100644
--- a/src/test/run-pass/lib-vec.rs
+++ b/src/test/run-pass/lib-vec.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 use std;
 
 fn test_init_elt() {
diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs
index 2c3d6425..8fe47133 100644
--- a/src/test/run-pass/many.rs
+++ b/src/test/run-pass/many.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- rust -*-
 
 impure fn sub(chan[int] parent, int id) {
diff --git a/src/test/run-pass/maybe-mutable.rs b/src/test/run-pass/maybe-mutable.rs
index c0af0867..b859ae7c 100644
--- a/src/test/run-pass/maybe-mutable.rs
+++ b/src/test/run-pass/maybe-mutable.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // -*- rust -*-
 
 fn len(vec[mutable? int] v) -> uint {
diff --git a/src/test/run-pass/mlist-cycle.rs b/src/test/run-pass/mlist-cycle.rs
index 5dedd3d0..05056592 100644
--- a/src/test/run-pass/mlist-cycle.rs
+++ b/src/test/run-pass/mlist-cycle.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/mlist.rs b/src/test/run-pass/mlist.rs
index 3754d044..6fc45d7c 100644
--- a/src/test/run-pass/mlist.rs
+++ b/src/test/run-pass/mlist.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 // -*- rust -*-
 
 tag mlist {
diff --git a/src/test/run-pass/multi.rc b/src/test/run-pass/multi.rc
index 90f03ee9..ad08db6b 100644
--- a/src/test/run-pass/multi.rc
+++ b/src/test/run-pass/multi.rc
@@ -1,3 +1,4 @@
+// xfail-stage0
 mod multi = "multi-src" {
 
   mod foo; // implicitly = "foo.rs"
diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs
index 887fb391..367afaf8 100644
--- a/src/test/run-pass/mutable-alias-vec.rs
+++ b/src/test/run-pass/mutable-alias-vec.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/native-mod.rc b/src/test/run-pass/native-mod.rc
index 4fcf4499..17925c79 100644
--- a/src/test/run-pass/native-mod.rc
+++ b/src/test/run-pass/native-mod.rc
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 native mod libc = target_libc {
diff --git a/src/test/run-pass/native.rc b/src/test/run-pass/native.rc
index c0f019c5..89556096 100644
--- a/src/test/run-pass/native.rc
+++ b/src/test/run-pass/native.rc
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 native "rust" mod rustrt {
diff --git a/src/test/run-pass/obj-as.rs b/src/test/run-pass/obj-as.rs
index 62eda294..6e0dac37 100644
--- a/src/test/run-pass/obj-as.rs
+++ b/src/test/run-pass/obj-as.rs
@@ -1,3 +1,6 @@
+// xfail-boot
+// xfail-boot
+// xfail-stage0
 
 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 d1f54f8f..389675da 100644
--- a/src/test/run-pass/obj-dtor.rs
+++ b/src/test/run-pass/obj-dtor.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 b3338f38..c2bea010 100644
--- a/src/test/run-pass/pred.rs
+++ b/src/test/run-pass/pred.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 06787097..42d6229d 100644
--- a/src/test/run-pass/preempt.rs
+++ b/src/test/run-pass/preempt.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // This checks that preemption works.
 
 impure fn starve_main(chan[int] alive) {
diff --git a/src/test/run-pass/rt-circular-buffer.rs b/src/test/run-pass/rt-circular-buffer.rs
index 542846b4..17078116 100644
--- a/src/test/run-pass/rt-circular-buffer.rs
+++ b/src/test/run-pass/rt-circular-buffer.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 // Regression tests for circular_buffer when using a unit
diff --git a/src/test/run-pass/seq-compare.rs b/src/test/run-pass/seq-compare.rs
index b3fe5701..36db2b46 100644
--- a/src/test/run-pass/seq-compare.rs
+++ b/src/test/run-pass/seq-compare.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
   check ("hello" < "hellr");
   check ("hello " > "hello");
diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs
index 58d529e8..5e0a9c20 100644
--- a/src/test/run-pass/size-and-align.rs
+++ b/src/test/run-pass/size-and-align.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 tag clam[T] {
diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/run-pass/spawn-fn.rs
index 894a8321..ea069e31 100644
--- a/src/test/run-pass/spawn-fn.rs
+++ b/src/test/run-pass/spawn-fn.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- 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 68f665df..833e246a 100644
--- a/src/test/run-pass/spawn-module-qualified.rs
+++ b/src/test/run-pass/spawn-module-qualified.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 765d4c9e..5dd758ba 100644
--- a/src/test/run-pass/spawn.rs
+++ b/src/test/run-pass/spawn.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/str-append.rs b/src/test/run-pass/str-append.rs
index da4ca07f..724a0893 100644
--- a/src/test/run-pass/str-append.rs
+++ b/src/test/run-pass/str-append.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/syntax-extension-fmt.rs b/src/test/run-pass/syntax-extension-fmt.rs
index ebb09f96..db0d8a19 100644
--- a/src/test/run-pass/syntax-extension-fmt.rs
+++ b/src/test/run-pass/syntax-extension-fmt.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 509b6d8b..f48a1b81 100644
--- a/src/test/run-pass/syntax-extension-shell.rs
+++ b/src/test/run-pass/syntax-extension-shell.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 085f958e..9030340c 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 impure fn main() -> () {
     test05();
 }
diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/run-pass/task-comm-1.rs
index 48983b71..61613a20 100644
--- a/src/test/run-pass/task-comm-1.rs
+++ b/src/test/run-pass/task-comm-1.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 fn main() -> () {
    test00(); 
 }
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index e0164596..6932f7e0 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 impure 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 41069c7f..6de447ae 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 impure 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 ceb6ba01..5d89b5d3 100644
--- a/src/test/run-pass/task-comm-12.rs
+++ b/src/test/run-pass/task-comm-12.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 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 e7cfc247..2fb32f95 100644
--- a/src/test/run-pass/task-comm-13-thread.rs
+++ b/src/test/run-pass/task-comm-13-thread.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 6b29ec1e..719edbb7 100644
--- a/src/test/run-pass/task-comm-13.rs
+++ b/src/test/run-pass/task-comm-13.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 b5bd7331..1eee1a09 100644
--- a/src/test/run-pass/task-comm-15.rs
+++ b/src/test/run-pass/task-comm-15.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 impure 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 864d49de..a6fc9115 100644
--- a/src/test/run-pass/task-comm-2.rs
+++ b/src/test/run-pass/task-comm-2.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 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 d833c3a5..b172a099 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 impure 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 099f8d6b..599d2d83 100644
--- a/src/test/run-pass/task-comm-7.rs
+++ b/src/test/run-pass/task-comm-7.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 impure fn main() -> () {
    test00();
 }
diff --git a/src/test/run-pass/task-comm-8.rs b/src/test/run-pass/task-comm-8.rs
index 87fa3d89..1bc02660 100644
--- a/src/test/run-pass/task-comm-8.rs
+++ b/src/test/run-pass/task-comm-8.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 impure fn main() -> () {
    test00();
 }
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs
index 370a36e3..cf375853 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/run-pass/task-comm-9.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 impure fn main() -> () {
    test00();
 }
diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs
index c8f5a90f..a341d939 100644
--- a/src/test/run-pass/task-comm-chan-nil.rs
+++ b/src/test/run-pass/task-comm-chan-nil.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 // -*- rust -*-
 
 // rustboot can't transmit nils across channels because they don't have
diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs
index d5f9a3a0..04751e37 100644
--- a/src/test/run-pass/task-comm.rs
+++ b/src/test/run-pass/task-comm.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 
 impure fn main() -> () {
     test00(true);
diff --git a/src/test/run-pass/task-killjoin.rs b/src/test/run-pass/task-killjoin.rs
index 558c1687..6a9f272f 100644
--- a/src/test/run-pass/task-killjoin.rs
+++ b/src/test/run-pass/task-killjoin.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 f15792fb..567f63a9 100644
--- a/src/test/run-pass/task-life-0.rs
+++ b/src/test/run-pass/task-life-0.rs
@@ -1,3 +1,5 @@
+// xfail-boot
+// xfail-stage0
 fn main() -> () {
     spawn child("Hello");
 }
diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs
index aa6e763f..3b6d8c0b 100644
--- a/src/test/run-pass/threads.rs
+++ b/src/test/run-pass/threads.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index a257ee09..67b8b578 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 
 import size_of = std.sys.rustrt.size_of;
 
diff --git a/src/test/run-pass/typestate-cfg-nesting.rs b/src/test/run-pass/typestate-cfg-nesting.rs
index 8f050646..73399525 100644
--- a/src/test/run-pass/typestate-cfg-nesting.rs
+++ b/src/test/run-pass/typestate-cfg-nesting.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 
 fn f() {
 
diff --git a/src/test/run-pass/use-import-export.rs b/src/test/run-pass/use-import-export.rs
index 0b330269..51495931 100644
--- a/src/test/run-pass/use-import-export.rs
+++ b/src/test/run-pass/use-import-export.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 
 mod foo {
   export x;
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index ac46061c..a71957f2 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 e72d0bca..b8a8144c 100644
--- a/src/test/run-pass/user.rs
+++ b/src/test/run-pass/user.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std (name = "std",
diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs
index 5fd4dcfe..68f5fa9f 100644
--- a/src/test/run-pass/utf8.rs
+++ b/src/test/run-pass/utf8.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 04f8f574..08671093 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/run-pass/utf8_chars.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 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 8dba9812..83d58d73 100644
--- a/src/test/run-pass/vec-alloc-append.rs
+++ b/src/test/run-pass/vec-alloc-append.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // 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 ca906e55..0f9f56dd 100644
--- a/src/test/run-pass/vec-append.rs
+++ b/src/test/run-pass/vec-append.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 use std;
diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs
index 332eff34..55174142 100644
--- a/src/test/run-pass/vec-slice.rs
+++ b/src/test/run-pass/vec-slice.rs
@@ -1,3 +1,6 @@
+// xfail-boot
+// xfail-boot
+// xfail-stage0
 fn main() {
   let vec[int] v = vec(1,2,3,4,5);
   auto v2 = v.(1,2);
diff --git a/src/test/run-pass/while-and-do-while.rs b/src/test/run-pass/while-and-do-while.rs
index ebf78099..e48ab2fc 100644
--- a/src/test/run-pass/while-and-do-while.rs
+++ b/src/test/run-pass/while-and-do-while.rs
@@ -1,3 +1,4 @@
+// xfail-boot
 fn main() {
   let int x = 10;
   let int y = 0;
diff --git a/src/test/run-pass/while-with-break.rs b/src/test/run-pass/while-with-break.rs
index 0e27f252..40efebc8 100644
--- a/src/test/run-pass/while-with-break.rs
+++ b/src/test/run-pass/while-with-break.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs
index d2ae592a..7b931afb 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/run-pass/yield.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 fn main() {
diff --git a/src/test/run-pass/yield2.rs b/src/test/run-pass/yield2.rs
index 11285822..f1a54341 100644
--- a/src/test/run-pass/yield2.rs
+++ b/src/test/run-pass/yield2.rs
@@ -1,3 +1,4 @@
+// xfail-stage0
 // -*- rust -*-
 
 fn main() {