about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2018-07-28 12:14:35 +0200
committerMatthias Krüger <matthias.krueger@famsik.de>2018-07-30 00:11:58 +0200
commita2343bfe7f2bcf1eba034a3a151a7a3a23c4ccc8 (patch)
tree40eaf26ae472430f9ac582042c092d593a2c0843
parente0214397bdf0d48b7dcd520cd075d3a22092d823 (diff)
downloadrust-a2343bfe7f2bcf1eba034a3a151a7a3a23c4ccc8.tar.gz
rust-a2343bfe7f2bcf1eba034a3a151a7a3a23c4ccc8.zip
integration tests: add more clippy warnings for greater coverage
integration/base tests: add a few code comments
-rwxr-xr-xci/base-tests.sh9
-rwxr-xr-xci/integration-tests.sh3
2 files changed, 10 insertions, 2 deletions
diff --git a/ci/base-tests.sh b/ci/base-tests.sh
index 69cd5abd925..13b652c0f7d 100755
--- a/ci/base-tests.sh
+++ b/ci/base-tests.sh
@@ -1,17 +1,24 @@
 set -ex
+
+echo "Running clippy base tests"
+
 PATH=$PATH:./node_modules/.bin
 remark -f *.md > /dev/null
+# build clippy in debug mode and run tests
 cargo build --features debugging
 cargo test --features debugging
 mkdir -p ~/rust/cargo/bin
 cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
 cp target/debug/clippy-driver ~/rust/cargo/bin/clippy-driver
 rm ~/.cargo/bin/cargo-clippy
-PATH=$PATH:~/rust/cargo/bin cargo clippy --all-targets --all-features -- --cap-lints warn -D clippy
+# run clippy on its own codebase...
+PATH=$PATH:~/rust/cargo/bin cargo clippy --all-targets --all-features -- -D clippy
+# ... and some test directories
 cd clippy_workspace_tests && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
 cd clippy_workspace_tests/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..
 cd clippy_workspace_tests/subcrate && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../..
 cd clippy_workspace_tests/subcrate/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../../..
+# test --manifest-path
 PATH=$PATH:~/rust/cargo/bin cargo clippy --manifest-path=clippy_workspace_tests/Cargo.toml -- -D clippy
 cd clippy_workspace_tests/subcrate && PATH=$PATH:~/rust/cargo/bin cargo clippy --manifest-path=../Cargo.toml -- -D clippy && cd ../..
 set +x
diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index 67ace0b5c88..ac0d2f1614b 100755
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -8,7 +8,8 @@ git clone --depth=1 https://github.com/${INTEGRATION}.git checkout
 cd checkout
 
 function check() {
-  RUST_BACKTRACE=full cargo clippy --all-targets --all-features -- --cap-lints warn &> clippy_output
+# 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  &> clippy_output
   cat clippy_output
   ! cat clippy_output | grep -q "internal compiler error\|query stack during panic"
   if [[ $? != 0 ]]; then