summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-11-30 14:31:04 -0800
committerAlex Crichton <alex@alexcrichton.com>2018-11-30 14:31:04 -0800
commit8ee62bb2394596e2c9a72828b755ba90329ea119 (patch)
tree538024063407f41d7843d4320e7edfe7df27c08b /src/ci/docker
parentd09466ceb1374bd0ff1c490bfd50133b8ca67558 (diff)
downloadrust-8ee62bb2394596e2c9a72828b755ba90329ea119.tar.gz
rust-8ee62bb2394596e2c9a72828b755ba90329ea119.zip
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/docker')
-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