about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-16 07:54:59 +0000
committerbors <bors@rust-lang.org>2017-06-16 07:54:59 +0000
commitc3627e25ee275323ff224bfd7c0fd0bc1362c28d (patch)
tree41c9bf11920a9e44ab36fddf442e5a2e3fac3503 /src/bootstrap
parent4581e89a49c4b1209f9152a38a3cbb909c6209c9 (diff)
parent9da77b3ec5dd99c50629005480323e6684957409 (diff)
downloadrust-c3627e25ee275323ff224bfd7c0fd0bc1362c28d.tar.gz
rust-c3627e25ee275323ff224bfd7c0fd0bc1362c28d.zip
Auto merge of #42631 - malbarbo:wasm32, r=alexcrichton
Add a travis builder for wasm32-unknown-emscripten

This commits add an entry to travis matrix that will execute wasm32-unknown-emscripten tests suites.

- Emscripten for asmjs was updated to sdk-1.37.13-64bit
- The tests are run with node 8.0.0 (it can execute wasm)
- A wrapper script is used to run each test from the directory where it is (workaround for https://github.com/kripken/emscripten/issues/4542)
- Some tests are ignore, see #42629 and #42630
Diffstat (limited to 'src/bootstrap')
-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 5ecd752d0ce..2a1b27334c3 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -567,7 +567,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());
         }
     }