diff --git a/.travis.yml b/.travis.yml index be8912378950..b1c7271d878b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,18 +63,18 @@ matrix: if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=bluss/rust-itertools if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - - env: INTEGRATION=serde-rs/serde MANIFEST_PATH=serde/Cargo.toml + - env: INTEGRATION=serde-rs/serde if: repo =~ /^rust-lang\/rust-clippy$/ - - env: INTEGRATION=rust-lang-nursery/stdsimd MANIFEST_PATH=crates/core_arch/Cargo.toml + - env: INTEGRATION=rust-lang-nursery/stdsimd if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-random/rand if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - - env: INTEGRATION=rust-lang-nursery/futures-rs MANIFEST_PATH=futures/Cargo.toml + - env: INTEGRATION=rust-lang-nursery/futures-rs 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 - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-lang-nursery/log if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=chronotope/chrono diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh index 296f3c07f195..16098c50ec45 100755 --- a/ci/integration-tests.sh +++ b/ci/integration-tests.sh @@ -16,18 +16,12 @@ echo "Running integration test for crate ${INTEGRATION}" git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout cd checkout -MANIFEST_OPTS=() -if [[ -n "$MANIFEST_PATH" ]]; then - MANIFEST_OPTS=("--manifest-path=$MANIFEST_PATH") -fi - # 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 \ - "${MANIFEST_OPTS[@]}" \ -- \ --cap-lints warn \ -W clippy::pedantic \ @@ -36,6 +30,6 @@ cargo clippy \ cat clippy_output -if grep -q "internal compiler error\|query stack during panic\|E0463\|--all-features is not allowed" clippy_output; then +if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then exit 1 fi