Skip to content

Commit

Permalink
Rollup merge of rust-lang#40259 - TimNN:fix-emscripten-tests, r=alexc…
Browse files Browse the repository at this point in the history
…richton

Fix emscripten test detection

Without this change `rustbuild` will attempt to run `.js.map` files (if they exist) resulting in lots of sadness.

r? @alexcrichton
  • Loading branch information
frewsxcv committed Mar 9, 2017
2 parents b7bd3fa + 4eeede3 commit 6cba0f9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ fn find_tests(dir: &Path,
let filename = e.file_name().into_string().unwrap();
if (target.contains("windows") && filename.ends_with(".exe")) ||
(!target.contains("windows") && !filename.contains(".")) ||
(target.contains("emscripten") && filename.contains(".js")){
(target.contains("emscripten") && filename.ends_with(".js")) {
dst.push(e.path());
}
}
Expand Down

0 comments on commit 6cba0f9

Please sign in to comment.