Skip to content

Commit 4c967e7

Browse files
borsbors
committed
auto merge of #12110 : fhahn/rust/issue-11363-change-xfail, r=alexcrichton
Patch for #11363
2 parents 616e53f + f62460c commit 4c967e7

File tree

539 files changed

+1154
-1142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+1154
-1142
lines changed

‎mk/tests.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ifdef TESTNAME
3434
TESTARGS += $(TESTNAME)
3535
endif
3636

37-
ifdef CHECK_XFAILS
37+
ifdef CHECK_IGNORED
3838
TESTARGS += --ignored
3939
endif
4040

‎src/compiletest/compiletest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub fn parse_config(args: ~[~str]) -> config {
6161
reqopt("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
6262
reqopt("", "mode", "which sort of compile tests to run",
6363
"(compile-fail|run-fail|run-pass|pretty|debug-info)"),
64-
optflag("", "ignored", "run tests marked as ignored / xfailed"),
64+
optflag("", "ignored", "run tests marked as ignored"),
6565
optopt("", "runtool", "supervisor program to run tests under \
6666
(eg. emulator, valgrind)", "PROGRAM"),
6767
optopt("", "rustcflags", "flags to pass to rustc", "FLAGS"),

‎src/compiletest/header.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,19 @@ pub fn load_props(testfile: &Path) -> TestProps {
9595
}
9696

9797
pub fn is_test_ignored(config: &config, testfile: &Path) -> bool {
98-
fn xfail_target(config: &config) -> ~str {
99-
~"xfail-" + util::get_os(config.target)
98+
fn ignore_target(config: &config) -> ~str {
99+
~"ignore-" + util::get_os(config.target)
100100
}
101-
fn xfail_stage(config: &config) -> ~str {
102-
~"xfail-" + config.stage_id.split('-').next().unwrap()
101+
fn ignore_stage(config: &config) -> ~str {
102+
~"ignore-" + config.stage_id.split('-').next().unwrap()
103103
}
104104
105105
let val = iter_header(testfile, |ln| {
106-
if parse_name_directive(ln, "xfail-test") { false }
107-
else if parse_name_directive(ln, xfail_target(config)) { false }
108-
else if parse_name_directive(ln, xfail_stage(config)) { false }
106+
if parse_name_directive(ln, "ignore-test") { false }
107+
else if parse_name_directive(ln, ignore_target(config)) { false }
108+
else if parse_name_directive(ln, ignore_stage(config)) { false }
109109
else if config.mode == common::mode_pretty &&
110-
parse_name_directive(ln, "xfail-pretty") { false }
110+
parse_name_directive(ln, "ignore-pretty") { false }
111111
else { true }
112112
});
113113

‎src/etc/combine-tests.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
1+
# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT
22
# file at the top-level directory of this distribution and at
33
# http://rust-lang.org/COPYRIGHT.
44
#
@@ -36,9 +36,9 @@ def scrub(b):
3636
t.startswith(".") or t.startswith("#") or t.startswith("~")):
3737
f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
3838
s = f.read()
39-
if not ("xfail-test" in s or
40-
"xfail-fast" in s or
41-
"xfail-win32" in s):
39+
if not ("ignore-test" in s or
40+
"ignore-fast" in s or
41+
"ignore-win32" in s):
4242
if not "pub fn main" in s and "fn main" in s:
4343
print("Warning: no public entry point in " + t)
4444
stage2_tests.append(t)

‎src/etc/extract-tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def extract_code_fragments(dest_dir, lines):
9999
block.appendleft(OUTPUT_BLOCK_HEADER)
100100

101101
if "ignore" in tags:
102-
block.appendleft("//xfail-test\n")
102+
block.appendleft("//ignore-test\n")
103103
elif "should_fail" in tags:
104104
block.appendleft("//should-fail\n")
105105

‎src/etc/licenseck.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
# file at the top-level directory of this distribution and at
33
# http://rust-lang.org/COPYRIGHT.
44
#
@@ -52,12 +52,12 @@ def check_license(name, contents):
5252

5353
# Xfail check
5454
firstlineish = contents[:100]
55-
if firstlineish.find("xfail-license") != -1:
55+
if firstlineish.find("ignore-license") != -1:
5656
return True
5757

5858
# License check
5959
boilerplate = contents[:500]
6060
if (boilerplate.find(license1) == -1 or boilerplate.find(license2) == -1) and \
6161
(boilerplate.find(license3) == -1 or boilerplate.find(license4) == -1):
6262
return False
63-
return True
63+
return True

‎src/etc/tidy.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
err=0
1616
cols=100
17-
cr_flag="xfail-tidy-cr"
18-
tab_flag="xfail-tidy-tab"
19-
linelength_flag="xfail-tidy-linelength"
17+
cr_flag="ignore-tidy-cr"
18+
tab_flag="ignore-tidy-tab"
19+
linelength_flag="ignore-tidy-linelength"
2020

2121
# Be careful to support Python 2.4, 2.6, and 3.x here!
2222
config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],

‎src/libgreen/sched.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -1364,7 +1364,7 @@ mod test {
13641364
});
13651365
}
13661366

1367-
// FIXME: #9407: xfail-test
1367+
// FIXME: #9407: ignore-test
13681368
#[ignore]
13691369
#[test]
13701370
fn dont_starve_1() {

‎src/test/auxiliary/crateresolve7x.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast
11+
// ignore-fast
1212
// aux-build:crateresolve_calories-1.rs
1313
// aux-build:crateresolve_calories-2.rs
1414

‎src/test/auxiliary/issue-2414-b.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast
11+
// ignore-fast
1212

1313
#[crate_id="b#0.1"];
1414
#[crate_type = "lib"];

‎src/test/auxiliary/issue-9906.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like extern mod
11+
// ignore-fast windows doesn't like extern mod
1212
// aux-build:issue-9906.rs
1313

1414
pub use other::FooBar;

‎src/test/bench/core-set.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// xfail-pretty
1+
// ignore-pretty
22

3-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
3+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
44
// file at the top-level directory of this distribution and at
55
// http://rust-lang.org/COPYRIGHT.
66
//

‎src/test/bench/shootout-fannkuch-redux.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test reading from os::args()[1] - bogus!
11+
// ignore-test reading from os::args()[1] - bogus!
1212

1313
use std::from_str::FromStr;
1414
use std::os;

‎src/test/bench/shootout-fasta-redux.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test reading from os::args()[1] - bogus!
11+
// ignore-test reading from os::args()[1] - bogus!
1212

1313
use std::cast::transmute;
1414
use std::from_str::FromStr;

‎src/test/bench/shootout-k-nucleotide-pipes.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,9 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-android: FIXME(#10393)
11+
// ignore-android: FIXME(#10393)
1212

13-
// xfail-pretty the `let to_child` line gets an extra newline
13+
// ignore-pretty the `let to_child` line gets an extra newline
1414
// multi tasking k-nucleotide
1515

1616
extern mod extra;

‎src/test/bench/shootout-k-nucleotide.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
11+
// ignore-test
1212

1313
extern mod extra;
1414

‎src/test/bench/shootout-reverse-complement.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-android doesn't terminate?
11+
// ignore-android doesn't terminate?
1212

1313
use std::iter::range_step;
1414
use std::io::{stdin, stdout, File};

‎src/test/bench/shootout-spectralnorm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test arcs no longer unwrap
11+
// ignore-test arcs no longer unwrap
1212

1313
extern mod sync;
1414

‎src/test/bench/sudoku.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// xfail-pretty
1+
// ignore-pretty
22

3-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
3+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
44
// file at the top-level directory of this distribution and at
55
// http://rust-lang.org/COPYRIGHT.
66
//

‎src/test/bench/task-perf-jargon-metal-smoke.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// xfail-pretty
1+
// ignore-pretty
22

3-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
3+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
44
// file at the top-level directory of this distribution and at
55
// http://rust-lang.org/COPYRIGHT.
66
//

‎src/test/bench/task-perf-linked-failure.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-pretty
12-
// xfail-test linked failure
11+
// ignore-pretty
12+
// ignore-test linked failure
1313

14-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
14+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
1515
// file at the top-level directory of this distribution and at
1616
// http://rust-lang.org/COPYRIGHT.
1717
//

‎src/test/bench/task-perf-one-million.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -10,7 +10,7 @@
1010

1111
// Test for concurrent tasks
1212

13-
// xfail-test OOM on linux-32 without opts
13+
// ignore-test OOM on linux-32 without opts
1414

1515
use std::os;
1616
use std::task;

‎src/test/compile-fail/ambig_impl_2_exe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast aux-build
11+
// ignore-fast aux-build
1212
// aux-build:ambig_impl_2_lib.rs
1313
extern mod ambig_impl_2_lib;
1414
use ambig_impl_2_lib::me;

‎src/test/compile-fail/asm-in-bad-modifier.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast #[feature] doesn't work with check-fast
11+
// ignore-fast #[feature] doesn't work with check-fast
1212
#[feature(asm)];
1313

1414
fn foo(x: int) { info!("{}", x); }

‎src/test/compile-fail/asm-out-assign-imm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast #[feature] doesn't work with check-fast
11+
// ignore-fast #[feature] doesn't work with check-fast
1212
#[feature(asm)];
1313

1414
fn foo(x: int) { info!("{}", x); }

‎src/test/compile-fail/asm-out-no-modifier.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast #[feature] doesn't work with check-fast
11+
// ignore-fast #[feature] doesn't work with check-fast
1212
#[feature(asm)];
1313

1414
fn foo(x: int) { info!("{}", x); }

‎src/test/compile-fail/asm-out-read-uninit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast #[feature] doesn't work with check-fast
11+
// ignore-fast #[feature] doesn't work with check-fast
1212
#[feature(asm)];
1313

1414
fn foo(x: int) { info!("{}", x); }

‎src/test/compile-fail/bad-char-literals3.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-tidy-cr
11+
// ignore-tidy-cr
1212
fn main() {
1313
// note that this is a literal "\r" byte
1414
'

0 commit comments

Comments
 (0)