---

yaml
---
r: 5065
b: refs/heads/master
c: 6209e84
h: refs/heads/master
i:
  5063: e656cd7
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66bc01472000ffe38798c9ecc03df1e0e95cb635
+refs/heads/master: 6209e844eefe6058fab2c0427e4a6f4ff21dc865

trunk/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)

trunk/src/etc/combine-tests.py

@@ -27,7 +27,7 @@ def scrub(b):
       t.startswith(".") or t.startswith("#") or t.startswith("~")):
         f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
         s = f.read()
-        if not ("xfail-stage2" in s or
+        if not ("xfail-test" in s or
                 "xfail-fast" in s):
             stage2_tests.append(t)
             if "main(args: [str])" in s:

trunk/src/fuzzer/fuzzer.rs

@@ -38,8 +38,8 @@ fn contains(haystack: &str, needle: &str) -> bool {
 
 fn find_rust_files(files: &mutable [str], path: str) {
     if str::ends_with(path, ".rs") {
-        if file_contains(path, "xfail-stage1") {
-            //log_err "Skipping " + path + " because it is marked as xfail-stage1";
+        if file_contains(path, "xfail-test") {
+            //log_err "Skipping " + path + " because it is marked as xfail-test";
         } else { files += [path]; }
     } else if fs::file_is_dir(istr::from_estr(path))
         && str::find(path, "compile-fail") == -1 {

trunk/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) { }

trunk/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; }

trunk/src/test/compile-fail/dead-code-be.rs

@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 // error-pattern: dead

trunk/src/test/compile-fail/dead-code-ret.rs

@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 // error-pattern: dead

trunk/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

trunk/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;

trunk/src/test/compiletest/util.rs

@@ -24,7 +24,7 @@ fn lib_path_env_var() -> istr { ~"LD_LIBRARY_PATH" }
 fn lib_path_env_var() -> istr { ~"DYLD_LIBRARY_PATH" }
 
 #[cfg(target_os = "win32")]
-fn lib_path_env_var() -> istr { "PATH" }
+fn lib_path_env_var() -> istr { ~"PATH" }
 
 fn logv(config: &config, s: &istr) {
     log s;

trunk/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

trunk/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();
 

trunk/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.

trunk/src/test/run-pass/acyclic-unwind.rs

@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 use std;

trunk/src/test/run-pass/alt-type-simple.rs

@@ -1,6 +1,6 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+
+// xfail-test
+
 fn altsimple(any x) {
   alt type (f) {
     case (int i) { print("int"); }

trunk/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

trunk/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() {

trunk/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() {

trunk/src/test/run-pass/bind-native.rs

@@ -2,10 +2,7 @@
 Can we bind native things?
 */
 
-//xfail-stage0
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 native "rust" mod rustrt {
     fn task_yield();

trunk/src/test/run-pass/clone-with-exterior.rs

@@ -1,7 +1,4 @@
-//xfail-stage0
-//xfail-stage1
-//xfail-stage2
-//xfail-stage3
+//xfail-test
 
 use std;
 import std::task;

trunk/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() { } }

trunk/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;

trunk/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 =

trunk/src/test/run-pass/mlist-cycle.rs

@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 use std;
 

trunk/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 {

trunk/src/test/run-pass/native.rc

@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 native "rust" mod rustrt {

trunk/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; }

trunk/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>) {

trunk/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;

trunk/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;

trunk/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;

trunk/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;

trunk/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;

trunk/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;

trunk/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;

trunk/src/test/run-pass/task-comm-10.rs

@@ -1,9 +1,6 @@
 // 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;

trunk/src/test/run-pass/task-comm-11.rs

@@ -1,4 +1,3 @@
-// xfail-stage3
 use std;
 import std::comm;
 import std::task;

trunk/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;
 

trunk/src/test/run-pass/task-compare.rs

@@ -3,10 +3,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;

trunk/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,

trunk/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;
 

trunk/src/test/run-pass/unchecked-predicates.rs

@@ -1,4 +1,3 @@
-// xfail-stage0
 // Uses foldl to exhibit the unchecked block syntax.
 use std;
 

trunk/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");

trunk/src/test/run-pass/user.rs

@@ -1,6 +1,4 @@
-// xfail-stage1
-// xfail-stage2
-// xfail-stage3
+// xfail-test
 // -*- rust -*-
 
 use std (name = "std",

trunk/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);