Change `xfail` directives in compiletests to `ignore`, closes #11363

4 files changed, 11 insertions, 11 deletions

diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py
index f1ac3e89846..2c6edaea284 100755
--- a/src/etc/combine-tests.py
+++ b/src/etc/combine-tests.py
@@ -1,4 +1,4 @@
-# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #
@@ -36,9 +36,9 @@ for t in os.listdir(run_pass):
             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-test" in s or
-                "xfail-fast" in s or
-                "xfail-win32" in s):
+        if not ("ignore-test" in s or
+                "ignore-fast" in s or
+                "ignore-win32" in s):
             if not "pub fn main" in s and "fn main" in s:
                 print("Warning: no public entry point in " + t)
             stage2_tests.append(t)
diff --git a/src/etc/extract-tests.py b/src/etc/extract-tests.py
index 06cdf66a918..13eadc79880 100644
--- a/src/etc/extract-tests.py
+++ b/src/etc/extract-tests.py
@@ -99,7 +99,7 @@ def extract_code_fragments(dest_dir, lines):
         block.appendleft(OUTPUT_BLOCK_HEADER)
 
         if "ignore" in tags:
-            block.appendleft("//xfail-test\n")
+            block.appendleft("//ignore-test\n")
         elif "should_fail" in tags:
             block.appendleft("//should-fail\n")
 
diff --git a/src/etc/licenseck.py b/src/etc/licenseck.py
index e214a40e3d1..1e599125e89 100644
--- a/src/etc/licenseck.py
+++ b/src/etc/licenseck.py
@@ -1,4 +1,4 @@
-# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #
@@ -52,7 +52,7 @@ def check_license(name, contents):
 
     # Xfail check
     firstlineish = contents[:100]
-    if firstlineish.find("xfail-license") != -1:
+    if firstlineish.find("ignore-license") != -1:
         return True
 
     # License check
@@ -60,4 +60,4 @@ def check_license(name, contents):
     if (boilerplate.find(license1) == -1 or boilerplate.find(license2) == -1) and \
        (boilerplate.find(license3) == -1 or boilerplate.find(license4) == -1):
         return False
-    return True
\ No newline at end of file
+    return True
diff --git a/src/etc/tidy.py b/src/etc/tidy.py
index 9bab9a3d998..6529b4d084e 100644
--- a/src/etc/tidy.py
+++ b/src/etc/tidy.py
@@ -14,9 +14,9 @@ import snapshot
 
 err=0
 cols=100
-cr_flag="xfail-tidy-cr"
-tab_flag="xfail-tidy-tab"
-linelength_flag="xfail-tidy-linelength"
+cr_flag="ignore-tidy-cr"
+tab_flag="ignore-tidy-tab"
+linelength_flag="ignore-tidy-linelength"
 
 # Be careful to support Python 2.4, 2.6, and 3.x here!
 config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],