Skip to content

Commit ecc714d

Browse files
committed
fix parsing the test harness JSON when time could not be measured
1 parent a6803b9 commit ecc714d

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/bootstrap/src/utils/render_tests.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,16 @@ impl<'a> Renderer<'a> {
231231
print!("\ntest result: ");
232232
self.builder.colored_stdout(|stdout| outcome.write_long(stdout)).unwrap();
233233
println!(
234-
". {} passed; {} failed; {} ignored; {} measured; {} filtered out; \
235-
finished in {:.2?}\n",
234+
". {} passed; {} failed; {} ignored; {} measured; {} filtered out{time}\n",
236235
suite.passed,
237236
suite.failed,
238237
suite.ignored,
239238
suite.measured,
240239
suite.filtered_out,
241-
Duration::from_secs_f64(suite.exec_time)
240+
time = match suite.exec_time {
241+
Some(t) => format!("; finished in {:.2?}", Duration::from_secs_f64(t)),
242+
None => format!(""),
243+
}
242244
);
243245
}
244246

@@ -374,7 +376,9 @@ struct SuiteOutcome {
374376
ignored: usize,
375377
measured: usize,
376378
filtered_out: usize,
377-
exec_time: f64,
379+
/// The time it took to execute this test suite, or `None` if time measurement was not possible
380+
/// (e.g. due to running inside Miri).
381+
exec_time: Option<f64>,
378382
}
379383

380384
#[derive(serde_derive::Deserialize)]

0 commit comments

Comments
 (0)