File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ matrix:
2929 SCCACHE_ERROR_LOG=/tmp/sccache.log
3030 MACOSX_DEPLOYMENT_TARGET=10.7
3131 NO_LLVM_ASSERTIONS=1
32+ NO_DEBUG_ASSERTIONS=1
3233 os: osx
3334 osx_image: xcode7
3435
@@ -48,6 +49,7 @@ matrix:
4849 MACOSX_DEPLOYMENT_TARGET=10.8
4950 MACOSX_STD_DEPLOYMENT_TARGET=10.7
5051 NO_LLVM_ASSERTIONS=1
52+ NO_DEBUG_ASSERTIONS=1
5153 os: osx
5254 osx_image: xcode8.2
5355 - env : >
@@ -59,6 +61,7 @@ matrix:
5961 MACOSX_DEPLOYMENT_TARGET=10.8
6062 MACOSX_STD_DEPLOYMENT_TARGET=10.7
6163 NO_LLVM_ASSERTIONS=1
64+ NO_DEBUG_ASSERTIONS=1
6265 os: osx
6366 osx_image: xcode8.2
6467
@@ -77,6 +80,7 @@ matrix:
7780 SCCACHE_ERROR_LOG=/tmp/sccache.log
7881 MACOSX_DEPLOYMENT_TARGET=10.7
7982 NO_LLVM_ASSERTIONS=1
83+ NO_DEBUG_ASSERTIONS=1
8084 os: osx
8185 osx_image: xcode7
8286 - env : >
@@ -88,6 +92,7 @@ matrix:
8892 SCCACHE_ERROR_LOG=/tmp/sccache.log
8993 MACOSX_DEPLOYMENT_TARGET=10.7
9094 NO_LLVM_ASSERTIONS=1
95+ NO_DEBUG_ASSERTIONS=1
9196 os: osx
9297 osx_image: xcode7
9398
Original file line number Diff line number Diff line change @@ -52,7 +52,11 @@ if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
5252 RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --disable-llvm-assertions"
5353 fi
5454else
55- RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --enable-debug-assertions"
55+ # We almost always want debug assertions enabled, but sometimes this takes too
56+ # long for too little benefit, so we just turn them off.
57+ if [ " $NO_DEBUG_ASSERTIONS " = " " ]; then
58+ RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --enable-debug-assertions"
59+ fi
5660
5761 # In general we always want to run tests with LLVM assertions enabled, but not
5862 # all platforms currently support that, so we have an option to disable.
You can’t perform that action at this time.
0 commit comments