about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-03-16 11:42:42 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-03-16 12:47:49 -0700
commit1c4b9c103496d876ee4254ce5259c89c725c4c5e (patch)
tree5e4de4b255276f53dde1d690bf1beb0cef7a93d8
parentcc34ca1c9787fde84116637a0cee92fc5e375e3d (diff)
downloadrust-1c4b9c103496d876ee4254ce5259c89c725c4c5e.tar.gz
rust-1c4b9c103496d876ee4254ce5259c89c725c4c5e.zip
ci: Disable optimized tests for asm.js
Since all tests are compiled with LTO effectively in Emscripten this commit
disables optimizations to hopefully squeeze some more time out of the CI
builders.

Closes #48826
-rw-r--r--src/ci/docker/asmjs/Dockerfile2
-rw-r--r--src/test/run-pass/deep.rs4
-rw-r--r--src/test/run-pass/float-int-invalid-const-cast.rs2
-rw-r--r--src/test/run-pass/intrinsics-integer.rs2
-rw-r--r--src/test/run-pass/intrinsics-math.rs2
-rw-r--r--src/test/run-pass/issue-32947.rs2
-rw-r--r--src/test/run-pass/issue-38074.rs2
-rw-r--r--src/test/run-pass/issue-39720.rs2
-rw-r--r--src/test/run-pass/mir_heavy_promoted.rs2
-rw-r--r--src/test/run-pass/next-power-of-two-overflow-debug.rs1
-rw-r--r--src/test/run-pass/next-power-of-two-overflow-ndebug.rs1
-rw-r--r--src/test/run-pass/packed-struct-borrow-element.rs1
-rw-r--r--src/test/run-pass/simd-intrinsic-generic-arithmetic.rs2
-rw-r--r--src/test/run-pass/simd-intrinsic-generic-comparison.rs2
-rw-r--r--src/test/run-pass/simd-intrinsic-generic-elements.rs2
15 files changed, 25 insertions, 4 deletions
diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile
index 2a0901691a5..be1b161f33e 100644
--- a/src/ci/docker/asmjs/Dockerfile
+++ b/src/ci/docker/asmjs/Dockerfile
@@ -29,6 +29,6 @@ ENV EM_CONFIG=/emsdk-portable/.emscripten
 
 ENV TARGETS=asmjs-unknown-emscripten
 
-ENV RUST_CONFIGURE_ARGS --enable-emscripten
+ENV RUST_CONFIGURE_ARGS --enable-emscripten --disable-optimize-tests
 
 ENV SCRIPT python2.7 ../x.py test --target $TARGETS
diff --git a/src/test/run-pass/deep.rs b/src/test/run-pass/deep.rs
index 9ae4f2c1e70..d59fe8d813d 100644
--- a/src/test/run-pass/deep.rs
+++ b/src/test/run-pass/deep.rs
@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
-
+// ignore-emscripten apparently blows the stack
 
 fn f(x: isize) -> isize {
     if x == 1 { return 1; } else { let y: isize = 1 + f(x - 1); return y; }
diff --git a/src/test/run-pass/float-int-invalid-const-cast.rs b/src/test/run-pass/float-int-invalid-const-cast.rs
index 80ab12482cb..d44f78922c7 100644
--- a/src/test/run-pass/float-int-invalid-const-cast.rs
+++ b/src/test/run-pass/float-int-invalid-const-cast.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten no i128 support
+
 #![feature(i128_type)]
 #![deny(const_err)]
 
diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs
index bfa3a1e128a..cdfad51e648 100644
--- a/src/test/run-pass/intrinsics-integer.rs
+++ b/src/test/run-pass/intrinsics-integer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten no i128 support
+
 #![feature(intrinsics, i128_type)]
 
 mod rusti {
diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/run-pass/intrinsics-math.rs
index a2c55634749..5132405a9d5 100644
--- a/src/test/run-pass/intrinsics-math.rs
+++ b/src/test/run-pass/intrinsics-math.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten fma not implemented in emscripten
+
 macro_rules! assert_approx_eq {
     ($a:expr, $b:expr) => ({
         let (a, b) = (&$a, &$b);
diff --git a/src/test/run-pass/issue-32947.rs b/src/test/run-pass/issue-32947.rs
index d0fef36efb9..d059a46b4df 100644
--- a/src/test/run-pass/issue-32947.rs
+++ b/src/test/run-pass/issue-32947.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten FIXME(#45351)
+
 #![feature(repr_simd, test)]
 
 extern crate test;
diff --git a/src/test/run-pass/issue-38074.rs b/src/test/run-pass/issue-38074.rs
index 5c9a63b8616..2368ba8a110 100644
--- a/src/test/run-pass/issue-38074.rs
+++ b/src/test/run-pass/issue-38074.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten FIXME(#45351)
+
 #![feature(platform_intrinsics, repr_simd)]
 
 extern "platform-intrinsic" {
diff --git a/src/test/run-pass/issue-39720.rs b/src/test/run-pass/issue-39720.rs
index f90696e3cdf..9873a8c2bf4 100644
--- a/src/test/run-pass/issue-39720.rs
+++ b/src/test/run-pass/issue-39720.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten FIXME(#45351)
+
 #![feature(repr_simd, platform_intrinsics)]
 
 #[repr(C)]
diff --git a/src/test/run-pass/mir_heavy_promoted.rs b/src/test/run-pass/mir_heavy_promoted.rs
index 9e033421574..b5085217577 100644
--- a/src/test/run-pass/mir_heavy_promoted.rs
+++ b/src/test/run-pass/mir_heavy_promoted.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten apparently only works in optimized mode
+
 const TEST_DATA: [u8; 32 * 1024 * 1024] = [42; 32 * 1024 * 1024];
 
 // Check that the promoted copy of TEST_DATA doesn't
diff --git a/src/test/run-pass/next-power-of-two-overflow-debug.rs b/src/test/run-pass/next-power-of-two-overflow-debug.rs
index 2782f8c2a59..599c6dfd31d 100644
--- a/src/test/run-pass/next-power-of-two-overflow-debug.rs
+++ b/src/test/run-pass/next-power-of-two-overflow-debug.rs
@@ -10,6 +10,7 @@
 
 // compile-flags: -C debug_assertions=yes
 // ignore-wasm32-bare compiled with panic=abort by default
+// ignore-emscripten dies with an LLVM error
 
 #![feature(i128_type)]
 
diff --git a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs b/src/test/run-pass/next-power-of-two-overflow-ndebug.rs
index f8bcb961c68..f2312b70be6 100644
--- a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs
+++ b/src/test/run-pass/next-power-of-two-overflow-ndebug.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // compile-flags: -C debug_assertions=no
+// ignore-emscripten dies with an LLVM error
 
 #![feature(i128_type)]
 
diff --git a/src/test/run-pass/packed-struct-borrow-element.rs b/src/test/run-pass/packed-struct-borrow-element.rs
index 3041c73afba..e725b25efee 100644
--- a/src/test/run-pass/packed-struct-borrow-element.rs
+++ b/src/test/run-pass/packed-struct-borrow-element.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten weird assertion?
 
 #[repr(packed)]
 struct Foo {
diff --git a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs b/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs
index 1894cd0084b..ac6d0c697ec 100644
--- a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs
+++ b/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten FIXME(#45351) hits an LLVM assert
+
 #![feature(repr_simd, platform_intrinsics)]
 
 #[repr(simd)]
diff --git a/src/test/run-pass/simd-intrinsic-generic-comparison.rs b/src/test/run-pass/simd-intrinsic-generic-comparison.rs
index 5802fb30bd6..d27378ba893 100644
--- a/src/test/run-pass/simd-intrinsic-generic-comparison.rs
+++ b/src/test/run-pass/simd-intrinsic-generic-comparison.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten FIXME(#45351) hits an LLVM assert
+
 #![feature(repr_simd, platform_intrinsics, concat_idents)]
 #![allow(non_camel_case_types)]
 
diff --git a/src/test/run-pass/simd-intrinsic-generic-elements.rs b/src/test/run-pass/simd-intrinsic-generic-elements.rs
index f0444c27170..72fcef27a66 100644
--- a/src/test/run-pass/simd-intrinsic-generic-elements.rs
+++ b/src/test/run-pass/simd-intrinsic-generic-elements.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-emscripten FIXME(#45351) hits an LLVM assert
+
 #![feature(repr_simd, platform_intrinsics)]
 
 #[repr(simd)]