nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 23:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sysroot getting code to tests.

Browse Source
This commit is contained in:
O01eg 2018-11-22 15:40:29 +03:00
parent 69813d6faf
commit 571d4cc7bf
No known key found for this signature in database
GPG Key ID: 8FBA74B3E78B4677
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/compile-test.rs
View File

@ -17,6 +17,7 @@ use std::ffi::OsStr;
use std::fs; use std::fs;
use std::io; use std::io;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::Command;
fn clippy_driver_path() -> PathBuf { fn clippy_driver_path() -> PathBuf {
if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") { if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") {
@ -42,6 +43,28 @@ fn rustc_lib_path() -> PathBuf {
option_env!("RUSTC_LIB_PATH").unwrap().into() option_env!("RUSTC_LIB_PATH").unwrap().into()
} }
fn rustc_sysroot_path() -> PathBuf {
option_env!("SYSROOT")
.map(String::from)
.or_else(|| std::env::var("SYSROOT").ok())
.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)))
})
.or_else(|| {
Command::new("rustc")
.arg("--print")
.arg("sysroot")
.output()
.ok()
.and_then(|out| String::from_utf8(out.stdout).ok())
.map(|s| s.trim().to_owned())
})
.expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust")
.into()
}
fn config(mode: &str, dir: PathBuf) -> compiletest::Config { fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
let mut config = compiletest::Config::default(); let mut config = compiletest::Config::default();
@ -55,7 +78,7 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
config.run_lib_path = rustc_lib_path(); config.run_lib_path = rustc_lib_path();
config.compile_lib_path = rustc_lib_path(); config.compile_lib_path = rustc_lib_path();
} }
config.target_rustcflags = Some(format!("-L {0} -L {0}/deps -Dwarnings", host_libs().display())); config.target_rustcflags = Some(format!("-L {0} -L {0}/deps -Dwarnings --sysroot {1}", host_libs().display(), rustc_sysroot_path().display()));
config.mode = cfg_mode; config.mode = cfg_mode;
config.build_base = if rustc_test_suite().is_some() { config.build_base = if rustc_test_suite().is_some() {