Skip to content

Commit 30891b8

Browse files
ehussehuss
committed
libtest: allow multiple filters
1 parent 9a9477f commit 30891b8

File tree

7 files changed

+63
-27
lines changed

7 files changed

+63
-27
lines changed

‎library/test/src/cli.rs

+6-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::time::TestTimeOptions;
1010
#[derive(Debug)]
1111
pub struct TestOpts {
1212
pub list: bool,
13-
pub filter: Option<String>,
13+
pub filters: Vec<String>,
1414
pub filter_exact: bool,
1515
pub force_run_in_process: bool,
1616
pub exclude_should_panic: bool,
@@ -148,12 +148,13 @@ fn optgroups() -> getopts::Options {
148148
}
149149

150150
fn usage(binary: &str, options: &getopts::Options) {
151-
let message = format!("Usage: {} [OPTIONS] [FILTER]", binary);
151+
let message = format!("Usage: {} [OPTIONS] [FILTERS...]", binary);
152152
println!(
153153
r#"{usage}
154154
155155
The FILTER string is tested against the name of all tests, and only those
156-
tests whose names contain the filter are run.
156+
tests whose names contain the filter are run. Multiple filter strings may
157+
be passed, which will run all tests matching any of the filters.
157158
158159
By default, all tests are run in parallel. This can be altered with the
159160
--test-threads flag or the RUST_TEST_THREADS environment variable when running
@@ -243,7 +244,7 @@ fn parse_opts_impl(matches: getopts::Matches) -> OptRes {
243244

244245
let logfile = get_log_file(&matches)?;
245246
let run_ignored = get_run_ignored(&matches, include_ignored)?;
246-
let filter = get_filter(&matches)?;
247+
let filters = matches.free.clone();
247248
let nocapture = get_nocapture(&matches)?;
248249
let test_threads = get_test_threads(&matches)?;
249250
let color = get_color_config(&matches)?;
@@ -253,7 +254,7 @@ fn parse_opts_impl(matches: getopts::Matches) -> OptRes {
253254

254255
let test_opts = TestOpts {
255256
list,
256-
filter,
257+
filters,
257258
filter_exact: exact,
258259
force_run_in_process,
259260
exclude_should_panic,
@@ -397,12 +398,6 @@ fn get_run_ignored(matches: &getopts::Matches, include_ignored: bool) -> OptPart
397398
Ok(run_ignored)
398399
}
399400

400-
fn get_filter(matches: &getopts::Matches) -> OptPartRes<Option<String>> {
401-
let filter = if !matches.free.is_empty() { Some(matches.free[0].clone()) } else { None };
402-
403-
Ok(filter)
404-
}
405-
406401
fn get_allow_unstable(matches: &getopts::Matches) -> OptPartRes<bool> {
407402
let mut allow_unstable = false;
408403

‎library/test/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
359359
};
360360

361361
// Remove tests that don't match the test filter
362-
if let Some(ref filter) = opts.filter {
363-
filtered.retain(|test| matches_filter(test, filter));
362+
if !opts.filters.is_empty() {
363+
filtered.retain(|test| opts.filters.iter().any(|filter| matches_filter(test, filter)));
364364
}
365365

366366
// Skip tests that match any of the skip filters

‎library/test/src/tests.rs

+26-9
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl TestOpts {
3535
fn new() -> TestOpts {
3636
TestOpts {
3737
list: false,
38-
filter: None,
38+
filters: vec![],
3939
filter_exact: false,
4040
force_run_in_process: false,
4141
exclude_should_panic: false,
@@ -469,43 +469,60 @@ pub fn exact_filter_match() {
469469
}
470470

471471
let substr =
472-
filter_tests(&TestOpts { filter: Some("base".into()), ..TestOpts::new() }, tests());
472+
filter_tests(&TestOpts { filters: vec!["base".into()], ..TestOpts::new() }, tests());
473473
assert_eq!(substr.len(), 4);
474474

475-
let substr = filter_tests(&TestOpts { filter: Some("bas".into()), ..TestOpts::new() }, tests());
475+
let substr =
476+
filter_tests(&TestOpts { filters: vec!["bas".into()], ..TestOpts::new() }, tests());
476477
assert_eq!(substr.len(), 4);
477478

478479
let substr =
479-
filter_tests(&TestOpts { filter: Some("::test".into()), ..TestOpts::new() }, tests());
480+
filter_tests(&TestOpts { filters: vec!["::test".into()], ..TestOpts::new() }, tests());
480481
assert_eq!(substr.len(), 3);
481482

482483
let substr =
483-
filter_tests(&TestOpts { filter: Some("base::test".into()), ..TestOpts::new() }, tests());
484+
filter_tests(&TestOpts { filters: vec!["base::test".into()], ..TestOpts::new() }, tests());
484485
assert_eq!(substr.len(), 3);
485486

487+
let substr = filter_tests(
488+
&TestOpts { filters: vec!["test1".into(), "test2".into()], ..TestOpts::new() },
489+
tests(),
490+
);
491+
assert_eq!(substr.len(), 2);
492+
486493
let exact = filter_tests(
487-
&TestOpts { filter: Some("base".into()), filter_exact: true, ..TestOpts::new() },
494+
&TestOpts { filters: vec!["base".into()], filter_exact: true, ..TestOpts::new() },
488495
tests(),
489496
);
490497
assert_eq!(exact.len(), 1);
491498

492499
let exact = filter_tests(
493-
&TestOpts { filter: Some("bas".into()), filter_exact: true, ..TestOpts::new() },
500+
&TestOpts { filters: vec!["bas".into()], filter_exact: true, ..TestOpts::new() },
494501
tests(),
495502
);
496503
assert_eq!(exact.len(), 0);
497504

498505
let exact = filter_tests(
499-
&TestOpts { filter: Some("::test".into()), filter_exact: true, ..TestOpts::new() },
506+
&TestOpts { filters: vec!["::test".into()], filter_exact: true, ..TestOpts::new() },
500507
tests(),
501508
);
502509
assert_eq!(exact.len(), 0);
503510

504511
let exact = filter_tests(
505-
&TestOpts { filter: Some("base::test".into()), filter_exact: true, ..TestOpts::new() },
512+
&TestOpts { filters: vec!["base::test".into()], filter_exact: true, ..TestOpts::new() },
506513
tests(),
507514
);
508515
assert_eq!(exact.len(), 1);
516+
517+
let exact = filter_tests(
518+
&TestOpts {
519+
filters: vec!["base".into(), "base::test".into()],
520+
filter_exact: true,
521+
..TestOpts::new()
522+
},
523+
tests(),
524+
);
525+
assert_eq!(exact.len(), 2);
509526
}
510527

511528
#[test]

‎src/test/ui/test-attrs/test-filter-multiple.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// run-pass
2+
// compile-flags: --test
3+
// run-flags: --test-threads=1 test1 test2
4+
// check-run-results
5+
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
// ignore-emscripten no threads support
7+
8+
#[test]
9+
fn test1() {}
10+
11+
#[test]
12+
fn test2() {}
13+
14+
#[test]
15+
fn test3() {
16+
panic!("this should not run");
17+
}

‎src/test/ui/test-attrs/test-filter-multiple.run.stdout

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
running 2 tests
3+
test test1 ... ok
4+
test test2 ... ok
5+
6+
test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out; finished in $TIME
7+

‎src/tools/compiletest/src/common.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ pub struct Config {
240240
/// Run ignored tests
241241
pub run_ignored: bool,
242242

243-
/// Only run tests that match this filter
244-
pub filter: Option<String>,
243+
/// Only run tests that match these filters
244+
pub filters: Vec<String>,
245245

246246
/// Exactly match the filter, rather than a substring
247247
pub filter_exact: bool,

‎src/tools/compiletest/src/main.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
221221
suite: matches.opt_str("suite").unwrap(),
222222
debugger: None,
223223
run_ignored,
224-
filter: matches.free.first().cloned(),
224+
filters: matches.free.clone(),
225225
filter_exact: matches.opt_present("exact"),
226226
force_pass_mode: matches.opt_str("pass").map(|mode| {
227227
mode.parse::<PassMode>()
@@ -280,7 +280,7 @@ pub fn log_config(config: &Config) {
280280
logv(c, format!("stage_id: {}", config.stage_id));
281281
logv(c, format!("mode: {}", config.mode));
282282
logv(c, format!("run_ignored: {}", config.run_ignored));
283-
logv(c, format!("filter: {}", opt_str(&config.filter)));
283+
logv(c, format!("filters: {:?}", config.filters));
284284
logv(c, format!("filter_exact: {}", config.filter_exact));
285285
logv(
286286
c,
@@ -465,7 +465,7 @@ fn configure_lldb(config: &Config) -> Option<Config> {
465465
pub fn test_opts(config: &Config) -> test::TestOpts {
466466
test::TestOpts {
467467
exclude_should_panic: false,
468-
filter: config.filter.clone(),
468+
filters: config.filters.clone(),
469469
filter_exact: config.filter_exact,
470470
run_ignored: if config.run_ignored { test::RunIgnored::Yes } else { test::RunIgnored::No },
471471
format: if config.quiet { test::OutputFormat::Terse } else { test::OutputFormat::Pretty },

0 commit comments

Comments
 (0)