diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-06-03 01:00:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 01:00:52 -0400 |
| commit | 57b87c2c4fe4e00a4952ffcc0e1be603c9caa904 (patch) | |
| tree | 7c849852bfa173d056cb37ac791ddc61be9d9582 /src | |
| parent | e63d3b714886a84b01b80bc2f6931c83b931d1a6 (diff) | |
| parent | 3447aa764ac9626aba6de0179289fb41ddb31543 (diff) | |
| download | rust-57b87c2c4fe4e00a4952ffcc0e1be603c9caa904.tar.gz rust-57b87c2c4fe4e00a4952ffcc0e1be603c9caa904.zip | |
Rollup merge of #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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/native.rs | 2 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 1 | ||||
| -rwxr-xr-x | src/ci/run.sh | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index ce1f63b4233..6b9a6347d22 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -184,7 +184,7 @@ pub fn llvm(build: &Build, target: &str) { configure_compilers(&mut cfg); if env::var_os("SCCACHE_ERROR_LOG").is_some() { - cfg.env("RUST_LOG", "sccache=info"); + cfg.env("RUST_LOG", "sccache=warn"); } // FIXME: we don't actually need to build all LLVM tools and all LLVM diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index a9b1167b6fa..4f34a7214cb 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -79,6 +79,7 @@ exec docker \ --env DEPLOY_ALT=$DEPLOY_ALT \ --env LOCAL_USER_ID=`id -u` \ --env TRAVIS=${TRAVIS-false} \ + --env TRAVIS_BRANCH \ --volume "$HOME/.cargo:/cargo" \ --volume "$HOME/rustsrc:$HOME/rustsrc" \ --privileged \ diff --git a/src/ci/run.sh b/src/ci/run.sh index 08f5939ef79..549e804603c 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -23,6 +23,10 @@ fi ci_dir=`cd $(dirname $0) && pwd` source "$ci_dir/shared.sh" +if [ "$TRAVIS" == "true" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-quiet-tests" +fi + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps" |