diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rwxr-xr-x | ci/base-tests.sh | 15 | ||||
| -rw-r--r-- | src/driver.rs | 20 | ||||
| -rw-r--r-- | tests/dogfood.rs | 4 |
4 files changed, 32 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index ee990111af9..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 @@ -81,9 +81,6 @@ matrix: if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=chronotope/chrono if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - allow_failures: - - os: windows - env: CARGO_INCREMENTAL=0 BASE_TESTS=true # prevent these jobs with default env vars exclude: - os: linux @@ -94,7 +91,11 @@ script: - | rm rust-toolchain ./setup-toolchain.sh - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib + if [ "$TRAVIS_OS_NAME" == "windows" ]; then + export PATH=$PATH:$(rustc --print sysroot)/bin + else + export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib + fi - | if [ -z ${INTEGRATION} ]; then travis_wait 30 ./ci/base-tests.sh && sleep 5 @@ -104,7 +105,7 @@ script: after_success: | #!/bin/bash - if [ $(uname) == Linux ]; then + if [ "$TRAVIS_OS_NAME" == "linux" ]; then set -ex if [ -z ${INTEGRATION} ]; then ./.github/deploy.sh diff --git a/ci/base-tests.sh b/ci/base-tests.sh index c5d3eb3c902..a53a0ea52be 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -27,17 +27,20 @@ export CARGO_TARGET_DIR=`pwd`/target/ # Check running clippy-driver without cargo ( - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib - # Check sysroot handling 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 diff --git a/src/driver.rs b/src/driver.rs index e6b04bf0cfd..545c43f9a45 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -12,7 +12,7 @@ extern crate rustc_plugin; use rustc_interface::interface; use rustc_tools_util::*; -use std::path::Path; +use std::path::{Path, PathBuf}; use std::process::{exit, Command}; mod lintlist; @@ -270,12 +270,19 @@ pub fn main() { let sys_root_arg = arg_value(&orig_args, "--sysroot", |_| true); let have_sys_root_arg = sys_root_arg.is_some(); let sys_root = sys_root_arg - .map(std::string::ToString::to_string) - .or_else(|| std::env::var("SYSROOT").ok()) + .map(PathBuf::from) + .or_else(|| std::env::var("SYSROOT").ok().map(PathBuf::from)) .or_else(|| { let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME")); let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN")); - home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain))) + home.and_then(|home| { + toolchain.map(|toolchain| { + let mut path = PathBuf::from(home); + path.push("toolchains"); + path.push(toolchain); + path + }) + }) }) .or_else(|| { Command::new("rustc") @@ -284,9 +291,10 @@ pub fn main() { .output() .ok() .and_then(|out| String::from_utf8(out.stdout).ok()) - .map(|s| s.trim().to_owned()) + .map(|s| PathBuf::from(s.trim())) }) - .or_else(|| option_env!("SYSROOT").map(String::from)) + .or_else(|| option_env!("SYSROOT").map(PathBuf::from)) + .map(|pb| pb.to_string_lossy().to_string()) .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument. diff --git a/tests/dogfood.rs b/tests/dogfood.rs index 4153c9ef06e..1f03ba3950a 100644 --- a/tests/dogfood.rs +++ b/tests/dogfood.rs @@ -1,6 +1,6 @@ #[test] fn dogfood() { - if option_env!("RUSTC_TEST_SUITE").is_some() { + if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { return; } let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); @@ -30,7 +30,7 @@ fn dogfood() { #[test] fn dogfood_tests() { - if option_env!("RUSTC_TEST_SUITE").is_some() { + if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { return; } let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); |