about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-09-17 05:19:00 +0000
committerbors <bors@rust-lang.org>2017-09-17 05:19:00 +0000
commitef227f5ffe438783db0add58208d79dd84158c06 (patch)
treefad53422d84c0850da74533144871c7386267408 /src/ci
parent71e37674a1f1f876003c308429cc1ef4d15edf87 (diff)
parentc1a83acf9894ae0cdae37e4f71879cb2e2d1716b (diff)
downloadrust-ef227f5ffe438783db0add58208d79dd84158c06.tar.gz
rust-ef227f5ffe438783db0add58208d79dd84158c06.zip
Auto merge of #44641 - alexcrichton:disable-more-osx-assertions, r=Mark-Simulacrum
ci: Disable rustc debug assertions on OSX

This commit disables debug assertions for OSX in an effort to improve cycle time
on OSX. It looks like #44610 didn't shave off quite as much time as desired so
let's see how much this helps.
Diffstat (limited to 'src/ci')
-rwxr-xr-xsrc/ci/run.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 39fb4e44078..b4fa033c4a6 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -52,7 +52,11 @@ if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
   fi
 else
-  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-debug-assertions"
+  # We almost always want debug assertions enabled, but sometimes this takes too
+  # long for too little benefit, so we just turn them off.
+  if [ "$NO_DEBUG_ASSERTIONS" = "" ]; then
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-debug-assertions"
+  fi
 
   # In general we always want to run tests with LLVM assertions enabled, but not
   # all platforms currently support that, so we have an option to disable.