File tree 2 files changed +11
-6
lines changed
2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ matrix:
45
45
- os : linux
46
46
env : BASE_TESTS=true
47
47
- os : windows
48
- env : CARGO_INCREMENTAL=0 BASE_TESTS=true
48
+ env : CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true
49
49
50
50
# Builds that are only executed when a PR is r+ed or a try build is started
51
51
# We don't want to run these always because they go towards
Original file line number Diff line number Diff line change @@ -31,11 +31,16 @@ export CARGO_TARGET_DIR=`pwd`/target/
31
31
sysroot=$( ./target/debug/clippy-driver --print sysroot)
32
32
test $sysroot = $( rustc --print sysroot)
33
33
34
- sysroot=$( ./target/debug/clippy-driver --sysroot /tmp --print sysroot)
35
- test $sysroot = /tmp
36
-
37
- sysroot=$( SYSROOT=/tmp ./target/debug/clippy-driver --print sysroot)
38
- test $sysroot = /tmp
34
+ if [ -z $OS_WINDOWS ]; then
35
+ desired_sysroot=/tmp
36
+ else
37
+ desired_sysroot=C:/tmp
38
+ fi
39
+ sysroot=$( ./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
40
+ test $sysroot = $desired_sysroot
41
+
42
+ sysroot=$( SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
43
+ test $sysroot = $desired_sysroot
39
44
40
45
# Make sure this isn't set - clippy-driver should cope without it
41
46
unset CARGO_MANIFEST_DIR
You can’t perform that action at this time.
0 commit comments