Merge #3418

3418: Fix Travis Windows build r=flip1995 a=phansch Closes #3306 Co-authored-by: Philipp Hansch <[email protected]>
rust-lang · Nov 10, 2018 · 044023d · 044023d
2 parents 3bb8877 + f00f749
commit 044023d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,6 +40,8 @@ install:
       fi
       if [ "$TRAVIS_OS_NAME" == "windows" ]; then
         choco install windows-sdk-10.0
+        find tests/ui/* \( -name '*.rs' -or -name '*.stderr' -or -name '*.stdout' \) -exec dos2unix '{}' +
+        find tests/ui-toml/* \( -name '*.rs' -or -name '*.stderr' -or -name '*.stdout' -or -name '*.toml' \) -exec dos2unix '{}' +
       fi
     fi
 
@@ -64,9 +66,6 @@ matrix:
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom
     - env: INTEGRATION=hyperium/hyper
-  allow_failures:
-  - os: windows
-    env: BASE_TEST=true
 # prevent these jobs with default env vars
   exclude:
     - os: linux

diff --git a/ci/base-tests.sh b/ci/base-tests.sh
@@ -27,6 +27,7 @@ cd clippy_dev && cargo test && cd ..
 # Perform various checks for lint registration
 ./util/dev update_lints --check
 
+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