From 40af8ee7482daa49f775963c983fbfc1afeb2006 Mon Sep 17 00:00:00 2001
From: Keiichi Watanabe <keiichiw@chromium.org>
Date: Fri, 10 Apr 2020 21:43:45 +0900
Subject: [PATCH] crosvm: Enable cargo clippy in smoke_test

Enable cargo clippy in the smoke test script for kokoro with many whitelisted rules
to be resolved. This check will reject compile warnings as well.

Also, this CL removes cargo check in Docker.crosvm as cargo clippy is a superset of
cargo check.

BUG=chromium:908640
TEST=./wrapped_smoke_test.sh

Change-Id: Iaa546fc0166e3d9762c5e91144d036725d38b0f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145538
Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
Tested-by: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
---
 bin/clippy               | 28 ++++++++++++++++++++++++++--
 bin/smoke_test           |  2 ++
 docker/Dockerfile.crosvm |  4 ----
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/bin/clippy b/bin/clippy
index 66df660435..6631f26c64 100755
--- a/bin/clippy
+++ b/bin/clippy
@@ -16,10 +16,33 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 cd ..
 
 SUPPRESS=(
-    # To be resolved.
+    # TODO(crbug/908640): To be resolved.
+    borrowed_box
+    char_lit_as_u8
+    clone_on_copy
+    collapsible_if
+    comparison_chain
+    extra_unused_lifetimes
+    for_kv_map
+    inefficient_to_string
+    into_iter_on_ref
     let_unit_value
+    missing_safety_doc
+    needless_doctest_main
+    needless_range_loop
+    needless_return
+    option_map_unit_fn
     question_mark
     range_plus_one
+    redundant_clone
+    redundant_closure
+    single_match
+    slow_vector_initialization
+    unnecessary_filter_map
+    unnecessary_mut_passed
+    unneeded_field_pattern
+    useless_format
+    wrong_self_convention
 
     # We don't care about these lints. Okay to remain suppressed globally.
     blacklisted_name
@@ -49,4 +72,5 @@ SUPPRESS=(
 # Needed or else clippy won't re-run on code that has already compiled.
 cargo clean
 
-cargo clippy --all-features -- ${SUPPRESS[@]/#/-Aclippy::} "$@"
+cargo clippy --all-features --all-targets -- ${SUPPRESS[@]/#/-Aclippy::} "$@" \
+      -D warnings
diff --git a/bin/smoke_test b/bin/smoke_test
index b2d71f3f79..ade2a196dc 100755
--- a/bin/smoke_test
+++ b/bin/smoke_test
@@ -17,3 +17,5 @@ cargo test --no-fail-fast --features plugin,default-no-sandbox,wl-dmabuf,gpu,tpm
     --test-threads=1 $TEST_RUNNER_FLAGS
 echo "Running cargo fmt"
 bin/fmt --check
+echo "Running cargo clippy"
+bin/clippy
diff --git a/docker/Dockerfile.crosvm b/docker/Dockerfile.crosvm
index 00649ba017..60ba5a9c3b 100644
--- a/docker/Dockerfile.crosvm
+++ b/docker/Dockerfile.crosvm
@@ -2,10 +2,6 @@ FROM crosvm-base
 
 COPY . /platform/crosvm
 
-# Compile crosvm with all features, including experimental and/or platform specific ones that
-# are disabled at 'cargo install' below.
-RUN cargo check --all-features
-
 RUN cargo install --features 'default-no-sandbox wl-dmabuf gpu x' --path . --root /usr
 
 ARG UID=1000