diff --git a/.travis.yml b/.travis.yml index b2ad9d5b7e5..3f7c856a7f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ matrix: - os: linux env: BASE_TESTS=true - os: windows - env: CARGO_INCREMENTAL=0 BASE_TESTS=true + env: CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true # Builds that are only executed when a PR is r+ed or a try build is started # We don't want to run these always because they go towards diff --git a/ci/base-tests.sh b/ci/base-tests.sh index 34bc9a8eca2..a53a0ea52be 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -31,11 +31,16 @@ export CARGO_TARGET_DIR=`pwd`/target/ sysroot=$(./target/debug/clippy-driver --print sysroot) test $sysroot = $(rustc --print sysroot) - sysroot=$(./target/debug/clippy-driver --sysroot /tmp --print sysroot) - test $sysroot = /tmp + if [ -z $OS_WINDOWS ]; then + desired_sysroot=/tmp + else + desired_sysroot=C:/tmp + fi + sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot) + test $sysroot = $desired_sysroot - sysroot=$(SYSROOT=/tmp ./target/debug/clippy-driver --print sysroot) - test $sysroot = /tmp + sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot) + test $sysroot = $desired_sysroot # Make sure this isn't set - clippy-driver should cope without it unset CARGO_MANIFEST_DIR