bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

ignore test-args if user specifies suite_path

Browse source
This commit is contained in:
Collins Abitekaniza 2018-05-08 15:23:32 +03:00
parent 41ee6fe147
commit 2f8c2a93bf
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/test.rs
View file

@ -1008,12 +1008,8 @@ impl Step for Compiletest {
};
// Get test-args by striping suite path
let assert_file = |p: &PathBuf| {
assert!(p.is_file(), "Expected {:?} to be a path to a test file", p);
return true
};
let mut test_args: Vec<&str> = paths.iter().filter(|p| p.starts_with(suite_path) &&
assert_file(p)).map(|p| p.strip_prefix(suite_path).unwrap().to_str().unwrap()).collect();
p.is_file()).map(|p| p.strip_prefix(suite_path).unwrap().to_str().unwrap()).collect();
test_args.append(&mut builder.config.cmd.test_args());