From 62222c380c7104c3df0621c2d0c4d4bd34b7a559 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Thu, 24 Oct 2019 01:50:00 +0700 Subject: [PATCH 1/3] Early exit in integration tests --- ci/integration-tests.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh index 1095ec65dac9..16098c50ec45 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 From 077f365936fd06bb8f2cee18fc611de321fddd7a Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Sun, 27 Oct 2019 00:51:30 +0700 Subject: [PATCH 2/3] caplint --- ci/integration-tests.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh index 16098c50ec45..02fef7fe32ae 100755 --- a/ci/integration-tests.sh +++ b/ci/integration-tests.sh @@ -25,11 +25,4 @@ cargo clippy \ -- \ --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 -fi + -W clippy::nursery From b8c8b3d3c9d38541725263b462a4f7aa75cea1a2 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Sun, 27 Oct 2019 00:52:10 +0700 Subject: [PATCH 3/3] wip enable some integration tests --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64036ec3aa3a..1ecb6397199d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,11 +46,7 @@ matrix: fast_finish: true include: # Builds that are executed for every PR - - os: osx # run base tests on both platforms - os: linux - - os: windows - env: CARGO_INCREMENTAL=0 OS_WINDOWS=true - # Builds that are only executed when a PR is r+ed or a try build is started # We don't want to run these always because they go towards # the build limit within the Travis rust-lang account. @@ -70,13 +66,13 @@ matrix: - env: INTEGRATION=bluss/rust-itertools if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=serde-rs/serde - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-lang-nursery/stdsimd - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-random/rand - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-lang-nursery/futures-rs - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=Marwes/combine if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang-nursery/failure