about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarco A L Barbosa <malbarbo@gmail.com>2017-06-13 09:32:49 -0300
committerMarco A L Barbosa <malbarbo@gmail.com>2017-06-13 09:32:49 -0300
commit554f21bc02d07050cd182c06b01175267533becc (patch)
tree5004141c6747876fee920bd3c76161b7890f5832
parent9b88a1b30b5f18a47f5868a954a8d19fb2588d61 (diff)
downloadrust-554f21bc02d07050cd182c06b01175267533becc.tar.gz
rust-554f21bc02d07050cd182c06b01175267533becc.zip
Do not execute .asm.js files on wasm32 tests
Files with extensions .asm.js are used to generate .wasm files, they are
not intented to be execute.
-rw-r--r--src/bootstrap/check.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 385376333c1..0bba68545c5 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -563,7 +563,9 @@ 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.ends_with(".js")) {
+           (target.contains("emscripten") &&
+            filename.ends_with(".js") &&
+            !filename.ends_with(".asm.js")) {
             dst.push(e.path());
         }
     }