Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4c967e7

Browse files
committedFeb 11, 2014
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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"),

0 commit comments

Comments
 (0)
Please sign in to comment.