about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-03-10 16:51:22 -0600
committerAlex Crichton <alex@alexcrichton.com>2017-03-10 16:18:27 -0800
commit5c715dee38240cc3c4394cb32430f052e9fb0e9a (patch)
treeb52670424680a1dbe8cdad75a8b666041b070772
parent5377eab1ec0d8657cb398762296d82ebc8844a41 (diff)
parent4eeede3e0f2496994b4c0bbaa59927066d642807 (diff)
downloadrust-5c715dee38240cc3c4394cb32430f052e9fb0e9a.tar.gz
rust-5c715dee38240cc3c4394cb32430f052e9fb0e9a.zip
Rollup merge of #40259 - TimNN:fix-emscripten-tests, r=alexcrichton
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
-rw-r--r--src/bootstrap/check.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index dfe96b51799..68b3623a53f 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -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());
         }
     }