diff options
| author | Ralf Jung <post@ralfj.de> | 2024-03-29 19:18:51 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-04-04 09:23:02 +0200 |
| commit | ecc714d88ee0781192cfedcd7b717a7c0a9a4f05 (patch) | |
| tree | 7d92215a00403d331d3f41af16b7dcff7e7a8129 | |
| parent | a6803b9de4e7ab146b442162316b340f887a7796 (diff) | |
| download | rust-ecc714d88ee0781192cfedcd7b717a7c0a9a4f05.tar.gz rust-ecc714d88ee0781192cfedcd7b717a7c0a9a4f05.zip | |
fix parsing the test harness JSON when time could not be measured
| -rw-r--r-- | src/bootstrap/src/utils/render_tests.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/bootstrap/src/utils/render_tests.rs b/src/bootstrap/src/utils/render_tests.rs index 70f25b2cc87..95cd55c9a3d 100644 --- a/src/bootstrap/src/utils/render_tests.rs +++ b/src/bootstrap/src/utils/render_tests.rs @@ -231,14 +231,16 @@ impl<'a> Renderer<'a> { print!("\ntest result: "); self.builder.colored_stdout(|stdout| outcome.write_long(stdout)).unwrap(); println!( - ". {} passed; {} failed; {} ignored; {} measured; {} filtered out; \ - finished in {:.2?}\n", + ". {} passed; {} failed; {} ignored; {} measured; {} filtered out{time}\n", suite.passed, suite.failed, suite.ignored, suite.measured, suite.filtered_out, - Duration::from_secs_f64(suite.exec_time) + time = match suite.exec_time { + Some(t) => format!("; finished in {:.2?}", Duration::from_secs_f64(t)), + None => format!(""), + } ); } @@ -374,7 +376,9 @@ struct SuiteOutcome { ignored: usize, measured: usize, filtered_out: usize, - exec_time: f64, + /// The time it took to execute this test suite, or `None` if time measurement was not possible + /// (e.g. due to running inside Miri). + exec_time: Option<f64>, } #[derive(serde_derive::Deserialize)] |
