diff options
| author | bors <bors@rust-lang.org> | 2019-10-29 03:16:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-29 03:16:14 +0000 |
| commit | e2104d1e2eec9b22729d4ceb9376fba9ce31ef5a (patch) | |
| tree | aca16778b8c379c484b9d25a72a1a5eea9d9c78d | |
| parent | add2c6cff15c92dd7aff1c7ef5ca5456904de01e (diff) | |
| parent | 84da79e92229e3c5efea67a71aa13624b96cd1b3 (diff) | |
| download | rust-e2104d1e2eec9b22729d4ceb9376fba9ce31ef5a.tar.gz rust-e2104d1e2eec9b22729d4ceb9376fba9ce31ef5a.zip | |
Auto merge of #4720 - lzutao:int-errexit, r=phansch
Do not early exit if cargo clippy returns non-zero status code changelog: none
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | ci/integration-tests.sh | 15 |
2 files changed, 11 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 862a6a79cc0..26891ae23ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ cache: before_cache: - cargo install -Z install-upgrade cargo-cache --debug - cargo cache --autoclean + - find $HOME/.cargo/bin/ ! -type d -exec strip {} \; env: global: diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh index 1095ec65dac..16098c50ec4 100755 --- a/ci/integration-tests.sh +++ b/ci/integration-tests.sh @@ -14,16 +14,21 @@ cargo install --force --debug --path . echo "Running integration test for crate ${INTEGRATION}" git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout -cd checkout || exit 1 +cd checkout -# run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage +# run clippy on a project, try to be verbose and trigger as many warnings +# as possible for greater coverage RUST_BACKTRACE=full \ cargo clippy \ --all-targets \ --all-features \ - -- --cap-lints warn -W clippy::pedantic -W clippy::nursery \ - 2>& 1 \ -| tee clippy_output + -- \ + --cap-lints warn \ + -W clippy::pedantic \ + -W clippy::nursery \ + > clippy_output 2>&1 || true + +cat clippy_output if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then exit 1 |