Skip to content

Commit

Permalink
ignore test-args if user specifies suite_path
Browse files Browse the repository at this point in the history
  • Loading branch information
Collins Abitekaniza committed May 9, 2018
1 parent 41ee6fe commit 2f8c2a9
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down

0 comments on commit 2f8c2a9

Please sign in to comment.