diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/tools/bench/mod.rs | 2 | ||||
| -rw-r--r-- | cli/tools/bench/reporters.rs | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/cli/tools/bench/mod.rs b/cli/tools/bench/mod.rs index c640bea40..609dff282 100644 --- a/cli/tools/bench/mod.rs +++ b/cli/tools/bench/mod.rs @@ -233,7 +233,7 @@ async fn bench_specifier_inner( let benchmarks = if used_only { only } else { no_only }; let mut benchmarks = benchmarks .into_iter() - .filter(|(d, _)| filter.includes(&d.name) && !d.ignore) + .filter(|(d, _)| d.warmup || filter.includes(&d.name) && !d.ignore) .collect::<Vec<_>>(); let mut groups = IndexSet::<Option<String>>::new(); // make sure ungrouped benchmarks are placed above grouped diff --git a/cli/tools/bench/reporters.rs b/cli/tools/bench/reporters.rs index b09a73fc3..face54943 100644 --- a/cli/tools/bench/reporters.rs +++ b/cli/tools/bench/reporters.rs @@ -99,7 +99,6 @@ impl BenchReporter for JsonReporter { pub struct ConsoleReporter { name: String, show_output: bool, - has_ungrouped: bool, group: Option<String>, baseline: bool, group_measurements: Vec<(BenchDescription, BenchStats)>, @@ -114,7 +113,6 @@ impl ConsoleReporter { options: None, baseline: false, name: String::new(), - has_ungrouped: false, group_measurements: Vec::new(), } } @@ -173,18 +171,11 @@ impl BenchReporter for ConsoleReporter { self.name = desc.name.clone(); match &desc.group { - None => { - self.has_ungrouped = true; - } + None => {} Some(group) => { if self.group.is_none() || group != self.group.as_ref().unwrap() { self.report_group_summary(); - } - - if (self.group.is_none() && self.has_ungrouped) - || (self.group.is_some() && self.group_measurements.is_empty()) - { println!("{} {}", colors::gray("group"), colors::green(group)); } |