Skip to content

Commit

Permalink
Auto merge of #49095 - alexcrichton:debug-asmjs, r=kennytm
Browse files Browse the repository at this point in the history
Try to reduce amount of time on the asmjs builder

This PR has two commits for two separate strategies:

* First it disables optimizations for all tests, hopefully saving time by not optimizing the test code. This caused a number of run-pass tests to fail which are switched to being ignored here.
* Next it disables a number of test suites which aren't asm.js specific and already run elsewhere

cc #48826
  • Loading branch information
bors committed Mar 19, 2018
2 parents 5508b27 + 60eb308 commit c2f4744
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 5 deletions.
9 changes: 7 additions & 2 deletions src/ci/docker/asmjs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ 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
ENV SCRIPT python2.7 ../x.py test --target $TARGETS \
src/test/run-pass \
src/test/run-fail \
src/libstd \
src/liballoc \
src/libcore
4 changes: 1 addition & 3 deletions src/test/run-pass/deep.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/float-int-invalid-const-cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/intrinsics-integer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/intrinsics-math.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/issue-32947.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/issue-38074.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/issue-39720.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/mir_heavy_promoted.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/next-power-of-two-overflow-debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/next-power-of-two-overflow-ndebug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/packed-struct-borrow-element.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/simd-intrinsic-generic-arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/simd-intrinsic-generic-comparison.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/simd-intrinsic-generic-elements.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down

0 comments on commit c2f4744

Please sign in to comment.