Skip to content

Commit 18e80b8

Browse files
committed
Revert "pass manifest path to integration test of crates having virtual workspace"
This reverts commit eae1fb9.
1 parent 1d0a75e commit 18e80b8

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ matrix:
6363
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6464
- env: INTEGRATION=bluss/rust-itertools
6565
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
66-
- env: INTEGRATION=serde-rs/serde MANIFEST_PATH=serde/Cargo.toml
66+
- env: INTEGRATION=serde-rs/serde
6767
if: repo =~ /^rust-lang\/rust-clippy$/
68-
- env: INTEGRATION=rust-lang-nursery/stdsimd MANIFEST_PATH=crates/core_arch/Cargo.toml
68+
- env: INTEGRATION=rust-lang-nursery/stdsimd
6969
if: repo =~ /^rust-lang\/rust-clippy$/
7070
- env: INTEGRATION=rust-random/rand
7171
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
72-
- env: INTEGRATION=rust-lang-nursery/futures-rs MANIFEST_PATH=futures/Cargo.toml
72+
- env: INTEGRATION=rust-lang-nursery/futures-rs
7373
if: repo =~ /^rust-lang\/rust-clippy$/
7474
- env: INTEGRATION=Marwes/combine
7575
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7676
- env: INTEGRATION=rust-lang-nursery/failure
77-
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
77+
if: repo =~ /^rust-lang\/rust-clippy$/
7878
- env: INTEGRATION=rust-lang-nursery/log
7979
if: repo =~ /^rust-lang\/rust-clippy$/
8080
- env: INTEGRATION=chronotope/chrono

ci/integration-tests.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@ echo "Running integration test for crate ${INTEGRATION}"
1616
git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout
1717
cd checkout
1818

19-
MANIFEST_OPTS=()
20-
if [[ -n "$MANIFEST_PATH" ]]; then
21-
MANIFEST_OPTS=("--manifest-path=$MANIFEST_PATH")
22-
fi
23-
2419
# run clippy on a project, try to be verbose and trigger as many warnings
2520
# as possible for greater coverage
2621
RUST_BACKTRACE=full \
2722
cargo clippy \
2823
--all-targets \
2924
--all-features \
30-
"${MANIFEST_OPTS[@]}" \
3125
-- \
3226
--cap-lints warn \
3327
-W clippy::pedantic \
@@ -36,6 +30,6 @@ cargo clippy \
3630

3731
cat clippy_output
3832

39-
if grep -q "internal compiler error\|query stack during panic\|E0463\|--all-features is not allowed" clippy_output; then
33+
if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
4034
exit 1
4135
fi

0 commit comments

Comments
 (0)