Skip to content

Commit eae1fb9

Browse files
committed
pass manifest path to integration test of crates having virtual workspace
1 parent 9cec6a2 commit eae1fb9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ matrix:
6969
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7070
- env: INTEGRATION=bluss/rust-itertools
7171
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
72-
- env: INTEGRATION=serde-rs/serde
72+
- env: INTEGRATION=serde-rs/serde MANIFEST_PATH=serde/Cargo.toml
7373
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
74-
- env: INTEGRATION=rust-lang-nursery/stdsimd
74+
- env: INTEGRATION=rust-lang-nursery/stdsimd MANIFEST_PATH=crates/core_arch/Cargo.toml
7575
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7676
- env: INTEGRATION=rust-random/rand
7777
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
78-
- env: INTEGRATION=rust-lang-nursery/futures-rs
78+
- env: INTEGRATION=rust-lang-nursery/futures-rs MANIFEST_PATH=futures/Cargo.toml
7979
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
8080
- env: INTEGRATION=Marwes/combine
8181
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)

ci/integration-tests.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@ 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+
1924
# run clippy on a project, try to be verbose and trigger as many warnings
2025
# as possible for greater coverage
2126
RUST_BACKTRACE=full \
2227
cargo clippy \
2328
--all-targets \
2429
--all-features \
30+
"${MANIFEST_OPTS[@]}" \
2531
-- \
2632
--cap-lints warn \
2733
-W clippy::pedantic \
@@ -30,6 +36,6 @@ cargo clippy \
3036

3137
cat clippy_output
3238

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

0 commit comments

Comments
 (0)