From 10f458435cd47734e93941b6b12b49f8bae75744 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Thu, 24 Oct 2019 01:50:00 +0700
Subject: [PATCH 1/2] Early exit in integration tests

---
 ci/integration-tests.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index 1095ec65dac9..16098c50ec45 100755
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -14,16 +14,21 @@ cargo install --force --debug --path .
 echo "Running integration test for crate ${INTEGRATION}"
 
 git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout
-cd checkout || exit 1
+cd checkout
 
-# run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
+# 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 \
-    2>& 1 \
-| tee clippy_output
+    -- \
+    --cap-lints warn \
+    -W clippy::pedantic \
+    -W clippy::nursery \
+    > clippy_output 2>&1 || true
+
+cat clippy_output
 
 if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
     exit 1

From a9f221a09826a36b3ab697632546e2794d6b3fa5 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Sun, 27 Oct 2019 01:20:31 +0700
Subject: [PATCH 2/2] build: strip before caching in .cargo/bin

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 64036ec3aa3a..f9b3f47cea77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ cache:
   directories:
     - $HOME/.cargo
 before_cache:
+  - find $HOME/.cargo/bin/ ! -type d -exec strip {} \;
   - cargo install -Z install-upgrade cargo-cache --debug
   - cargo cache --autoclean