Skip to content

Commit e53cfb9

Browse files
committed
Fix fast-check target by disabling code snippet printing on warnings (broken on .rc files) and adding an xfail-fast flag for global-scope.rs.
1 parent 2e827ea commit e53cfb9

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/comp/syntax/codemap.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ fn emit_diagnostic(&option::t[span] sp, &str msg, &str kind, u8 color,
6363
alt (sp) {
6464
case (some(?ssp)) {
6565
ss = span_to_str(ssp, cm);
66-
maybe_lines = some(span_to_lines(ssp, cm));
66+
67+
// FIXME: we're not able to look up lines read from .rc files yet.
68+
// maybe_lines = some(span_to_lines(ssp, cm));
69+
6770
}
6871
case (none) { }
6972
}

src/etc/combine-tests.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ def scrub(b):
2525
if t.endswith(".rs"):
2626
f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
2727
s = f.read()
28-
if not ("xfail-stage2" in s):
28+
if not ("xfail-stage2" in s or
29+
"xfail-fast" in s):
2930
stage2_tests.append(t)
3031
if "main(vec[str] args)" in s:
3132
take_args[t] = True

src/test/run-pass/global-scope.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// xfail-stage0
2+
// xfail-fast
23

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

0 commit comments

Comments
 (0)