diff --git a/evergreen/bazel_coverage.sh b/evergreen/bazel_coverage.sh index 40fc600faf5..1634d404539 100644 --- a/evergreen/bazel_coverage.sh +++ b/evergreen/bazel_coverage.sh @@ -27,4 +27,5 @@ BAZEL_BINARY=bazel echo "python buildscripts/install_bazel.py" >bazel-invocation.txt echo " bazel coverage ${args} ${target}" >>bazel-invocation.txt +export MONGO_WRAPPER_OUTPUT_ALL=1 $BAZEL_BINARY coverage ${args} ${target} diff --git a/evergreen/coverity_build.sh b/evergreen/coverity_build.sh index f869f858b1c..349cdc3a165 100644 --- a/evergreen/coverity_build.sh +++ b/evergreen/coverity_build.sh @@ -14,6 +14,7 @@ else fi activate_venv +export MONGO_WRAPPER_OUTPUT_ALL=1 # number of parallel jobs to use for build. # Even with scale=0 (the default), bc command adds decimal digits in case of multiplication. Division by 1 gives us a whole number with scale=0 bazel_jobs=$(bc <<<"$(grep -c '^processor' /proc/cpuinfo) * .85 / 1") diff --git a/tools/bazel b/tools/bazel index e237044624c..5b65ceff524 100755 --- a/tools/bazel +++ b/tools/bazel @@ -145,10 +145,10 @@ if [ "$skip_python" == "1" ]; then fi -if [[ "$SLOW_PATH" == "1" ]]; then +if [[ "$SLOW_PATH" == "1" ]] && [[ -z "${MONGO_WRAPPER_OUTPUT_ALL}" ]]; then ORIGINAL_ARGS=("$@") - # Save original terminal output FDs + # Save original terminal output FDs exec 3>&1 4>&2 export MONGO_WRAPPER_STDOUT_FD=3 export MONGO_WRAPPER_STDERR_FD=4 @@ -293,8 +293,9 @@ if [[ $autocomplete_query == 1 ]]; then else trap 'cleanup_logfile' EXIT # Slow path: restore stdout/stderr so Bazel prints normally - exec 1>&3 2>&4 - + if [[ -z "${MONGO_WRAPPER_OUTPUT_ALL}" ]]; then + exec 1>&3 2>&4 + fi $bazel_real "${new_args[@]}" bazel_exit_code=$?