about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-01-29 13:32:13 +0000
committerbors <bors@rust-lang.org>2019-01-29 13:32:13 +0000
commitae1ba150a280ebe428c760fbbbd58ae758ba9ea7 (patch)
tree1619af8b402c5af211cbea3e7f1a41c52be6c605 /src/ci
parent106b3e9fa4d53efc4e8eab47d1043789c88f99a5 (diff)
parentfd9d9ee3a293bab88fd4dfb69f28d5ccb92e292c (diff)
downloadrust-ae1ba150a280ebe428c760fbbbd58ae758ba9ea7.tar.gz
rust-ae1ba150a280ebe428c760fbbbd58ae758ba9ea7.zip
Auto merge of #57948 - Zoxc:parallel, r=michaelwoerister
Use multiple threads by default. Limits tests to one thread. Do some renaming.

r? @michaelwoerister
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index b0e1b165105..42d0d7db596 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -82,7 +82,7 @@ fi
 SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
 
 if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
-  $SRC/configure --enable-experimental-parallel-queries
+  $SRC/configure --enable-parallel-compiler
   CARGO_INCREMENTAL=0 python2.7 ../x.py check
   rm -f config.toml
   rm -rf build