Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to reduce amount of time on the asmjs builder #49095

Merged
merged 2 commits into from
Mar 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should still enable run-pass-fulldeps, run-fail-fulldeps and run-make.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh currently I don't believe we run any of those tests, right?

Copy link
Member

@kennytm kennytm Mar 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh let me check...

Indeed they aren't run. In the previous build, the following tests are executed:

  • ui
  • run-pass
  • compile-fail
  • parse-fail
  • run-fail
  • run-pass-valgrind
  • mir-opt
  • codegen
  • codegen-units
  • incremental
  • debuginfo-gdb
  • (and the libraries)

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