Skip to content

Commit c2f4744

Browse files
committed
Auto merge of rust-lang#49095 - alexcrichton:debug-asmjs, r=kennytm
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 rust-lang#48826
2 parents 5508b27 + 60eb308 commit c2f4744

15 files changed

+31
-5
lines changed

src/ci/docker/asmjs/Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ ENV EM_CONFIG=/emsdk-portable/.emscripten
2929

3030
ENV TARGETS=asmjs-unknown-emscripten
3131

32-
ENV RUST_CONFIGURE_ARGS --enable-emscripten
32+
ENV RUST_CONFIGURE_ARGS --enable-emscripten --disable-optimize-tests
3333

34-
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
34+
ENV SCRIPT python2.7 ../x.py test --target $TARGETS \
35+
src/test/run-pass \
36+
src/test/run-fail \
37+
src/libstd \
38+
src/liballoc \
39+
src/libcore

src/test/run-pass/deep.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
12-
13-
11+
// ignore-emscripten apparently blows the stack
1412

1513
fn f(x: isize) -> isize {
1614
if x == 1 { return 1; } else { let y: isize = 1 + f(x - 1); return y; }

src/test/run-pass/float-int-invalid-const-cast.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten no i128 support
12+
1113
#![feature(i128_type)]
1214
#![deny(const_err)]
1315

src/test/run-pass/intrinsics-integer.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten no i128 support
12+
1113
#![feature(intrinsics, i128_type)]
1214

1315
mod rusti {

src/test/run-pass/intrinsics-math.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten fma not implemented in emscripten
12+
1113
macro_rules! assert_approx_eq {
1214
($a:expr, $b:expr) => ({
1315
let (a, b) = (&$a, &$b);

src/test/run-pass/issue-32947.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten FIXME(#45351)
12+
1113
#![feature(repr_simd, test)]
1214

1315
extern crate test;

src/test/run-pass/issue-38074.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten FIXME(#45351)
12+
1113
#![feature(platform_intrinsics, repr_simd)]
1214

1315
extern "platform-intrinsic" {

src/test/run-pass/issue-39720.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten FIXME(#45351)
12+
1113
#![feature(repr_simd, platform_intrinsics)]
1214

1315
#[repr(C)]

src/test/run-pass/mir_heavy_promoted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten apparently only works in optimized mode
12+
1113
const TEST_DATA: [u8; 32 * 1024 * 1024] = [42; 32 * 1024 * 1024];
1214

1315
// Check that the promoted copy of TEST_DATA doesn't

src/test/run-pass/next-power-of-two-overflow-debug.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// compile-flags: -C debug_assertions=yes
1212
// ignore-wasm32-bare compiled with panic=abort by default
13+
// ignore-emscripten dies with an LLVM error
1314

1415
#![feature(i128_type)]
1516

src/test/run-pass/next-power-of-two-overflow-ndebug.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// compile-flags: -C debug_assertions=no
12+
// ignore-emscripten dies with an LLVM error
1213

1314
#![feature(i128_type)]
1415

src/test/run-pass/packed-struct-borrow-element.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten weird assertion?
1112

1213
#[repr(packed)]
1314
struct Foo {

src/test/run-pass/simd-intrinsic-generic-arithmetic.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten FIXME(#45351) hits an LLVM assert
12+
1113
#![feature(repr_simd, platform_intrinsics)]
1214

1315
#[repr(simd)]

src/test/run-pass/simd-intrinsic-generic-comparison.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten FIXME(#45351) hits an LLVM assert
12+
1113
#![feature(repr_simd, platform_intrinsics, concat_idents)]
1214
#![allow(non_camel_case_types)]
1315

src/test/run-pass/simd-intrinsic-generic-elements.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-emscripten FIXME(#45351) hits an LLVM assert
12+
1113
#![feature(repr_simd, platform_intrinsics)]
1214

1315
#[repr(simd)]

0 commit comments

Comments
 (0)