diff options
| author | bors <bors@rust-lang.org> | 2017-06-16 07:54:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-16 07:54:59 +0000 |
| commit | c3627e25ee275323ff224bfd7c0fd0bc1362c28d (patch) | |
| tree | 41c9bf11920a9e44ab36fddf442e5a2e3fac3503 /src/test | |
| parent | 4581e89a49c4b1209f9152a38a3cbb909c6209c9 (diff) | |
| parent | 9da77b3ec5dd99c50629005480323e6684957409 (diff) | |
| download | rust-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/test')
| -rw-r--r-- | src/test/run-pass/asm-concat-src.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/conditional-compile-arch.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/issue-27859.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/out-of-stack.rs | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/test/run-pass/asm-concat-src.rs b/src/test/run-pass/asm-concat-src.rs index ea3d0c3aa0e..fb257bf7b50 100644 --- a/src/test/run-pass/asm-concat-src.rs +++ b/src/test/run-pass/asm-concat-src.rs @@ -9,7 +9,7 @@ // except according to those terms. // pretty-expanded FIXME #23616 -// ignore-asmjs +// ignore-emscripten #![feature(asm)] diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/run-pass/conditional-compile-arch.rs index 24c461d5f51..6e3e4be0d8e 100644 --- a/src/test/run-pass/conditional-compile-arch.rs +++ b/src/test/run-pass/conditional-compile-arch.rs @@ -36,3 +36,6 @@ pub fn main() { } #[cfg(target_arch = "asmjs")] pub fn main() { } + +#[cfg(target_arch = "wasm32")] +pub fn main() { } diff --git a/src/test/run-pass/issue-27859.rs b/src/test/run-pass/issue-27859.rs index 900614be612..56036caca15 100644 --- a/src/test/run-pass/issue-27859.rs +++ b/src/test/run-pass/issue-27859.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-wasm32 issue 42629 + #[inline(never)] fn foo(a: f32, b: f32) -> f32 { a % b diff --git a/src/test/run-pass/out-of-stack.rs b/src/test/run-pass/out-of-stack.rs index a7748b6d6a2..7e70c4a7ab3 100644 --- a/src/test/run-pass/out-of-stack.rs +++ b/src/test/run-pass/out-of-stack.rs @@ -10,7 +10,7 @@ // ignore-android: FIXME (#20004) // ignore-musl -// ignore-asmjs +// ignore-emscripten #![feature(asm)] #![feature(libc)] |