about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-01 03:04:12 +0000
committerbors <bors@rust-lang.org>2018-12-01 03:04:12 +0000
commitaef4dbfaa7df8221cb4e99cbda1299b47b1c2aca (patch)
tree538024063407f41d7843d4320e7edfe7df27c08b /src/ci
parentd09466ceb1374bd0ff1c490bfd50133b8ca67558 (diff)
parent8ee62bb2394596e2c9a72828b755ba90329ea119 (diff)
downloadrust-aef4dbfaa7df8221cb4e99cbda1299b47b1c2aca.tar.gz
rust-aef4dbfaa7df8221cb4e99cbda1299b47b1c2aca.zip
Auto merge of #56391 - alexcrichton:less-compare-mode, r=Mark-Simulacrum
ci: Only run compare-mode tests on one builder

The run-pass test suite currently takes 30 minutes on Windows, and
that appears to be roughly split between two 15 minute runs of the test
suite: one without NLL and one with NLL. In discussion on Discord the
platform coverage of the NLL compare mode may not necessarily be worth
it, so this commit removes the NLL compare mode from tests by default,
and then reenables it on only one builder.
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/docker/x86_64-gnu-nopt/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/docker/x86_64-gnu-nopt/Dockerfile b/src/ci/docker/x86_64-gnu-nopt/Dockerfile
index d2b0dd13dc2..b0780fdf32a 100644
--- a/src/ci/docker/x86_64-gnu-nopt/Dockerfile
+++ b/src/ci/docker/x86_64-gnu-nopt/Dockerfile
@@ -16,5 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --disable-optimize-tests
+ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu \
+  --disable-optimize-tests \
+  --set rust.test-compare-mode
 ENV RUST_CHECK_TARGET check