Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libtest: add a --skip flag to the test runner #36604

Merged
merged 2 commits into from
Sep 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/libtest/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ pub struct TestOpts {
pub color: ColorConfig,
pub quiet: bool,
pub test_threads: Option<usize>,
pub skip: Vec<String>,
}

impl TestOpts {
Expand All @@ -318,6 +319,7 @@ impl TestOpts {
color: AutoColor,
quiet: false,
test_threads: None,
skip: vec![],
}
}
}
Expand All @@ -337,6 +339,8 @@ fn optgroups() -> Vec<getopts::OptGroup> {
task, allow printing directly"),
getopts::optopt("", "test-threads", "Number of threads used for running tests \
in parallel", "n_threads"),
getopts::optmulti("", "skip", "Skip tests whose names contain FILTER (this flag can \
be used multiple times)","FILTER"),
getopts::optflag("q", "quiet", "Display one character per test instead of one line"),
getopts::optopt("", "color", "Configure coloring of output:
auto = colorize if stdout is a tty and tests are run on serially (default);
Expand Down Expand Up @@ -446,6 +450,7 @@ pub fn parse_opts(args: &[String]) -> Option<OptRes> {
color: color,
quiet: quiet,
test_threads: test_threads,
skip: matches.opt_strs("skip"),
};

Some(Ok(test_opts))
Expand Down Expand Up @@ -1095,6 +1100,11 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
}
};

// Skip tests that match any of the skip filters
filtered = filtered.into_iter()
.filter(|t| !opts.skip.iter().any(|sf| t.desc.name.as_slice().contains(&sf[..])))
.collect();

// Maybe pull out the ignored test and unignore them
filtered = if !opts.run_ignored {
filtered
Expand Down
1 change: 1 addition & 0 deletions src/tools/compiletest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
},
color: test::AutoColor,
test_threads: None,
skip: vec![],
}
}

Expand Down