Skip to content

Commit 57b87c2

Browse files
authored
Rollup merge of rust-lang#42354 - Mark-Simulacrum:reduce-verbosity, r=alexcrichton
Reduce verbosity of build logs This does two separate things. - Sets sccache logging to warn instead of info. - Makes tests when running for a given PR (not on auto branch) quiet. (cc @eddyb) r? @alexcrichton
2 parents e63d3b7 + 3447aa7 commit 57b87c2

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/bootstrap/native.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pub fn llvm(build: &Build, target: &str) {
184184
configure_compilers(&mut cfg);
185185

186186
if env::var_os("SCCACHE_ERROR_LOG").is_some() {
187-
cfg.env("RUST_LOG", "sccache=info");
187+
cfg.env("RUST_LOG", "sccache=warn");
188188
}
189189

190190
// FIXME: we don't actually need to build all LLVM tools and all LLVM

src/ci/docker/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ exec docker \
7979
--env DEPLOY_ALT=$DEPLOY_ALT \
8080
--env LOCAL_USER_ID=`id -u` \
8181
--env TRAVIS=${TRAVIS-false} \
82+
--env TRAVIS_BRANCH \
8283
--volume "$HOME/.cargo:/cargo" \
8384
--volume "$HOME/rustsrc:$HOME/rustsrc" \
8485
--privileged \

src/ci/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ fi
2323
ci_dir=`cd $(dirname $0) && pwd`
2424
source "$ci_dir/shared.sh"
2525

26+
if [ "$TRAVIS" == "true" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
27+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-quiet-tests"
28+
fi
29+
2630
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"
2731
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
2832
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps"

0 commit comments

Comments
 (0)