From d8166bf141f8e245569430eed98f4ba38a5957bc Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Sun, 2 Dec 2018 14:33:19 +0100
Subject: [PATCH 1/2] Travis: Add rustc sysroot bin to PATH for windows build

---
 ci/base-tests.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/base-tests.sh b/ci/base-tests.sh
index e46f8c4c39a2..a046d21c4be4 100755
--- a/ci/base-tests.sh
+++ b/ci/base-tests.sh
@@ -28,6 +28,9 @@ cd clippy_dev && cargo test && cd ..
 ./util/dev update_lints --check
 cargo +nightly fmt --all -- --check
 
+# Add bin to PATH for windows
+PATH=$PATH:$(rustc --print sysroot)/bin
+
 CLIPPY="`pwd`/target/debug/cargo-clippy clippy"
 # run clippy on its own codebase...
 ${CLIPPY} --all-targets --all-features -- -D clippy::all -D clippy::internal -Dclippy::pedantic

From 39f179da450e8879341ed662e69ee95e6fcff9e3 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Sun, 2 Dec 2018 15:08:11 +0100
Subject: [PATCH 2/2] Disable incremental build for windows

Testing if this speeds up compilation time for the Windows CI build.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2db0033e2fc..b3331c8a26d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ matrix:
     - os: linux
       env: BASE_TESTS=true
     - os: windows
-      env: BASE_TESTS=true
+      env: CARGO_INCREMENTAL=0 BASE_TESTS=true
     - env: INTEGRATION=rust-lang/cargo
       if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-random/rand
@@ -81,7 +81,7 @@ matrix:
       if: repo =~ /^rust-lang\/rust-clippy$/
   allow_failures:
   - os: windows
-    env: BASE_TESTS=true
+    env: CARGO_INCREMENTAL=0 BASE_TESTS=true
 # prevent these jobs with default env vars
   exclude:
     - os: linux