From 821d293283f939272efecf8dd8c401c818c4428d Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 16 Sep 2019 11:43:23 -0700 Subject: [PATCH] azure: Disable more LLVM/debug assertions in This commit disables LLVM/debug assertions in our 5 slowest builders: * i686-gnu * i686-gnu-nopt * i686-msvc-1 * i686-msvc-2 * x86_64-msvc-cargo This is reducing the amount of test coverage for LLVM/debug assertions, but we're just unfortunately running out of time on CI too many times. Some test builds have shown that i686-gnu drops nearly an hour of CI time by disabling these two assertions. Perhaps when we eventually get 4-core machines we can reenable these, but for now turn them off and hook them up to the tracking issue at #59637 which will ideally be repurposes to tracking all of these. --- src/ci/azure-pipelines/auto.yml | 9 +++++++++ src/ci/docker/i686-gnu-nopt/Dockerfile | 3 +++ src/ci/docker/i686-gnu/Dockerfile | 3 +++ 3 files changed, 15 insertions(+) diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml index 77c9cda58b8e6..1656066eb29c9 100644 --- a/src/ci/azure-pipelines/auto.yml +++ b/src/ci/azure-pipelines/auto.yml @@ -236,10 +236,16 @@ jobs: MSYS_BITS: 32 RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make ci-subset-1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 i686-msvc-2: MSYS_BITS: 32 RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make ci-subset-2 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 # MSVC aux tests x86_64-msvc-aux: MSYS_BITS: 64 @@ -250,6 +256,9 @@ jobs: SCRIPT: python x.py test src/tools/cargotest src/tools/cargo RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc VCVARS_BAT: vcvars64.bat + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 # MSVC tools tests x86_64-msvc-tools: MSYS_BITS: 64 diff --git a/src/ci/docker/i686-gnu-nopt/Dockerfile b/src/ci/docker/i686-gnu-nopt/Dockerfile index 2041ba50bc9a0..517b59c38dcb0 100644 --- a/src/ci/docker/i686-gnu-nopt/Dockerfile +++ b/src/ci/docker/i686-gnu-nopt/Dockerfile @@ -19,3 +19,6 @@ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests ENV SCRIPT python2.7 ../x.py test + +# FIXME(#59637) takes too long on CI right now +ENV NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 diff --git a/src/ci/docker/i686-gnu/Dockerfile b/src/ci/docker/i686-gnu/Dockerfile index 17441ddb4546b..03db3ba0995d6 100644 --- a/src/ci/docker/i686-gnu/Dockerfile +++ b/src/ci/docker/i686-gnu/Dockerfile @@ -25,3 +25,6 @@ ENV SCRIPT python2.7 ../x.py test \ --exclude src/test/rustdoc-js \ --exclude src/tools/error_index_generator \ --exclude src/tools/linkchecker + +# FIXME(#59637) takes too long on CI right now +ENV NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1