Skip to content

Commit

Permalink
Fix fast-check target by disabling code snippet printing on warnings …
Browse files Browse the repository at this point in the history
…(broken on .rc files) and adding an xfail-fast flag for global-scope.rs.
  • Loading branch information
graydon committed Jul 13, 2011
1 parent 2e827ea commit e53cfb9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/comp/syntax/codemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ fn emit_diagnostic(&option::t[span] sp, &str msg, &str kind, u8 color,
alt (sp) {
case (some(?ssp)) {
ss = span_to_str(ssp, cm);
maybe_lines = some(span_to_lines(ssp, cm));

// FIXME: we're not able to look up lines read from .rc files yet.
// maybe_lines = some(span_to_lines(ssp, cm));

}
case (none) { }
}
Expand Down
3 changes: 2 additions & 1 deletion src/etc/combine-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ def scrub(b):
if t.endswith(".rs"):
f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
s = f.read()
if not ("xfail-stage2" in s):
if not ("xfail-stage2" in s or
"xfail-fast" in s):
stage2_tests.append(t)
if "main(vec[str] args)" in s:
take_args[t] = True
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/global-scope.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// xfail-stage0
// xfail-fast

fn f() -> int { ret 1; }

Expand Down

0 comments on commit e53cfb9

Please sign in to comment.