dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support non-unicode paths for dogfood test

This commit is contained in:
Michael Wright 2018-04-02 09:28:08 +02:00
parent e91404bcc3
commit add4434ee3
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main.rs
View File

@ -78,26 +78,29 @@ where
path.set_extension("exe");
}
let mut extra_envs = vec![];
if std::env::var("CLIPPY_DOGFOOD").is_ok() {
let target_dir = std::env::var("CARGO_MANIFEST_DIR")
.map(|m| {
std::path::PathBuf::from(m)
.join("target")
.join("dogfood")
.to_string_lossy()
.into_owned()
})
.unwrap_or_else(|_| "clippy_dogfood".to_string());
extra_envs.push(("CARGO_TARGET_DIR", target_dir));
};
let target_dir = std::env::var_os("CLIPPY_DOGFOOD")
.map(|_| {
std::env::var_os("CARGO_MANIFEST_DIR").map_or_else(
|| {
let mut fallback = std::ffi::OsString::new();
fallback.push("clippy_dogfood");
fallback
},
|d| {
std::path::PathBuf::from(d)
.join("target")
.join("dogfood")
.into_os_string()
},
)
})
.map(|p| ("CARGO_TARGET_DIR", p));
let exit_status = std::process::Command::new("cargo")
.args(&args)
.env("RUSTC_WRAPPER", path)
.env("CLIPPY_ARGS", clippy_args)
.envs(extra_envs)
.envs(target_dir)
.spawn()
.expect("could not run cargo")
.wait()