diff options
| author | Collins Abitekaniza <collins.abitekaniza@osmosisworld.com> | 2018-05-08 15:23:32 +0300 |
|---|---|---|
| committer | Collins Abitekaniza <collins.abitekaniza@osmosisworld.com> | 2018-05-09 03:24:03 +0300 |
| commit | 2f8c2a93bf5277774d93f690d1b03fe3e1a7b43f (patch) | |
| tree | 9c321b0394fd4d07b07dd0217d87e4b49317e994 | |
| parent | 41ee6fe14725011c327e18a77ff71738b17cd869 (diff) | |
| download | rust-2f8c2a93bf5277774d93f690d1b03fe3e1a7b43f.tar.gz rust-2f8c2a93bf5277774d93f690d1b03fe3e1a7b43f.zip | |
ignore test-args if user specifies suite_path
| -rw-r--r-- | src/bootstrap/test.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index efb92be60e6..1b07b4b96da 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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()); |