Skip to content

Commit 3e8fc65

Browse files
committed
pass manifest path to integration test of crates having virtual workspace
1 parent 5270d31 commit 3e8fc65

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ matrix:
7777
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7878
- env: INTEGRATION=bluss/rust-itertools
7979
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
80-
- env: INTEGRATION=serde-rs/serde
80+
- env: INTEGRATION=serde-rs/serde MANIFEST_PATH=serde/Cargo.toml
8181
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
82-
- env: INTEGRATION=rust-lang-nursery/stdsimd
82+
- env: INTEGRATION=rust-lang-nursery/stdsimd MANIFEST_PATH=crates/core_arch/Cargo.toml
8383
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
8484
- env: INTEGRATION=rust-random/rand
8585
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
86-
- env: INTEGRATION=rust-lang-nursery/futures-rs
86+
- env: INTEGRATION=rust-lang-nursery/futures-rs MANIFEST_PATH=futures/Cargo.toml
8787
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
8888
- env: INTEGRATION=Marwes/combine
8989
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)

ci/integration-tests.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,25 @@ echo "Running integration test for crate ${INTEGRATION}"
1313
git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout || exit 1
1414
cd checkout || exit 1
1515

16+
MANIFEST_OPTS=()
17+
if [[ -n "$MANIFEST_PATH" ]]; then
18+
MANIFEST_OPTS=("--manifest-path=$MANIFEST_PATH")
19+
fi
20+
1621
# run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
1722
RUST_BACKTRACE=full \
1823
cargo clippy \
1924
--all-targets \
2025
--all-features \
26+
"${MANIFEST_OPTS[@]}" \
2127
-- \
2228
--cap-lints warn \
2329
-W clippy::pedantic \
2430
-W clippy::nursery \
2531
> clippy_output 2>&1
26-
ERRNO=$?
2732

2833
cat clippy_output
2934

30-
if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output || [[ $ERRNO -ne 0 ]]; then
35+
if grep -q "internal compiler error\|query stack during panic\|E0463\|--all-features is not allowed" clippy_output; then
3136
exit 1
3237
fi

0 commit comments

Comments
 (0)