bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve compiletest target detection.

Browse source
This commit is contained in:
Scott Olson 2016-12-17 00:54:37 -08:00
parent 42239e69bf
commit 96b83ebb7c
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/compiletest.rs
View file

@ -36,10 +36,17 @@ fn miri_pass(path: &str, target: &str) {
compiletest::run_tests(&config); compiletest::run_tests(&config);
} }
fn is_target_dir<P: Into<PathBuf>>(path: P) -> bool {
let mut path = path.into();
path.push("lib");
path.metadata().map(|m| m.is_dir()).unwrap_or(false)
}
fn for_all_targets<F: FnMut(String)>(sysroot: &str, mut f: F) { fn for_all_targets<F: FnMut(String)>(sysroot: &str, mut f: F) {
for target in std::fs::read_dir(format!("{}/lib/rustlib/", sysroot)).unwrap() { for entry in std::fs::read_dir(format!("{}/lib/rustlib/", sysroot)).unwrap() {
let target = target.unwrap().file_name().into_string().unwrap(); let entry = entry.unwrap();
if !target.contains("-") { continue; } if !is_target_dir(entry.path()) { continue; }
let target = entry.file_name().into_string().unwrap();
let stderr = std::io::stderr(); let stderr = std::io::stderr();
writeln!(stderr.lock(), "running tests for target {}", target).unwrap(); writeln!(stderr.lock(), "running tests for target {}", target).unwrap();
f(target); f(target);