Skip to content

Commit

Permalink
auto merge of #12190 : alexcrichton/rust/fix-snap-again, r=brson
Browse files Browse the repository at this point in the history
Loadable syntax extensions don't work when cross compiling (see #12102), so the
fourcc tests all need to be ignored. They're valuable tests, so they shouldn't
be outright ignored, so they're now flagged with ignore-cross-compile
  • Loading branch information
bors committed Feb 12, 2014
2 parents 975908d + 314b02b commit 2ca02ea
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/compiletest/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ pub fn is_test_ignored(config: &config, testfile: &Path) -> bool {
else if parse_name_directive(ln, ignore_stage(config)) { false }
else if config.mode == common::mode_pretty &&
parse_name_directive(ln, "ignore-pretty") { false }
else if config.target != config.host &&
parse_name_directive(ln, "ignore-cross-compile") { false }
else { true }
});

Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/syntax-extension-fourcc-bad-len.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// ignore-stage1
// ignore-pretty
// ignore-android
// ignore-cross-compile #12102

#[feature(phase)];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// ignore-stage1
// ignore-pretty
// ignore-android
// ignore-cross-compile #12102

#[feature(phase)];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// ignore-stage1
// ignore-pretty
// ignore-android
// ignore-cross-compile #12102

#[feature(phase)];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// ignore-stage1
// ignore-pretty
// ignore-android
// ignore-cross-compile #12102

#[feature(phase)];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// ignore-stage1
// ignore-pretty
// ignore-android
// ignore-cross-compile #12102

#[feature(phase)];

Expand Down

0 comments on commit 2ca02ea

Please sign in to comment.