summaryrefslogtreecommitdiff
path: root/cli/args/flags.rs
diff options
context:
space:
mode:
authorRoj <ez@roj.im>2022-07-18 22:12:19 +0300
committerGitHub <noreply@github.com>2022-07-18 15:12:19 -0400
commit70d1ecaeaa7843b37e8ea5161b24988813b2f543 (patch)
tree011330b532ccd44320bf90c55c95b088467255bd /cli/args/flags.rs
parent1f04cea160071a296fc97a6bd50a2690521d70f6 (diff)
feat(cli): support configuring the test tool in the config file (#15079)
Diffstat (limited to 'cli/args/flags.rs')
-rw-r--r--cli/args/flags.rs25
1 files changed, 12 insertions, 13 deletions
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index c6fbb320b..9bab9db3b 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -175,7 +175,7 @@ pub struct TestFlags {
pub no_run: bool,
pub fail_fast: Option<NonZeroUsize>,
pub allow_none: bool,
- pub include: Option<Vec<String>>,
+ pub include: Vec<String>,
pub filter: Option<String>,
pub shuffle: Option<u64>,
pub concurrent_jobs: NonZeroUsize,
@@ -2682,15 +2682,14 @@ fn test_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
NonZeroUsize::new(1).unwrap()
};
- let include = if matches.is_present("files") {
- let files: Vec<String> = matches
+ let include: Vec<String> = if matches.is_present("files") {
+ matches
.values_of("files")
.unwrap()
.map(String::from)
- .collect();
- Some(files)
+ .collect::<Vec<_>>()
} else {
- None
+ Vec::new()
};
flags.coverage_dir = matches.value_of("coverage").map(String::from);
@@ -4995,7 +4994,7 @@ mod tests {
fail_fast: None,
filter: Some("- foo".to_string()),
allow_none: true,
- include: Some(svec!["dir1/", "dir2/"]),
+ include: svec!["dir1/", "dir2/"],
ignore: vec![],
shuffle: None,
concurrent_jobs: NonZeroUsize::new(1).unwrap(),
@@ -5067,7 +5066,7 @@ mod tests {
filter: None,
allow_none: false,
shuffle: None,
- include: None,
+ include: vec![],
ignore: vec![],
concurrent_jobs: NonZeroUsize::new(4).unwrap(),
trace_ops: false,
@@ -5095,7 +5094,7 @@ mod tests {
filter: None,
allow_none: false,
shuffle: None,
- include: None,
+ include: vec![],
ignore: vec![],
concurrent_jobs: NonZeroUsize::new(1).unwrap(),
trace_ops: false,
@@ -5127,7 +5126,7 @@ mod tests {
filter: None,
allow_none: false,
shuffle: None,
- include: None,
+ include: vec![],
ignore: vec![],
concurrent_jobs: NonZeroUsize::new(1).unwrap(),
trace_ops: false,
@@ -5153,7 +5152,7 @@ mod tests {
filter: None,
allow_none: false,
shuffle: Some(1),
- include: None,
+ include: vec![],
ignore: vec![],
concurrent_jobs: NonZeroUsize::new(1).unwrap(),
trace_ops: false,
@@ -5179,7 +5178,7 @@ mod tests {
filter: None,
allow_none: false,
shuffle: None,
- include: None,
+ include: vec![],
ignore: vec![],
concurrent_jobs: NonZeroUsize::new(1).unwrap(),
trace_ops: false,
@@ -5206,7 +5205,7 @@ mod tests {
filter: None,
allow_none: false,
shuffle: None,
- include: None,
+ include: vec![],
ignore: vec![],
concurrent_jobs: NonZeroUsize::new(1).unwrap(),
trace_ops: false,