Skip to content

Commit 2074631

Browse files
authored
Rollup merge of #123548 - RalfJung:what-is-time, r=joboet
libtest: also measure time in Miri A long time ago we disabled timekeeping of the default test harness in Miri, as otherwise it would fail to run without `-Zmiri-disable-isolation`. However, since then Miri gained a "fake clock" that lets it present some deterministic notion of time when isolation is enabled. So we could now let libtest do timekeeping again when running in Miri. That's nice as it can help detect tests that run too long. However it can also be confusing as the results with isolation can be quite different than the real time. ``@rust-lang/miri`` what do you think?
2 parents e07d18f + 510720e commit 2074631

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

library/test/src/console.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,8 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> io::Resu
315315

316316
// Prevent the usage of `Instant` in some cases:
317317
// - It's currently not supported for wasm targets.
318-
// - We disable it for miri because it's not available when isolation is enabled.
319-
let is_instant_unsupported = (cfg!(target_family = "wasm") && !cfg!(target_os = "wasi"))
320-
|| cfg!(target_os = "zkvm")
321-
|| cfg!(miri);
318+
let is_instant_unsupported =
319+
(cfg!(target_family = "wasm") && !cfg!(target_os = "wasi")) || cfg!(target_os = "zkvm");
322320

323321
let start_time = (!is_instant_unsupported).then(Instant::now);
324322
run_tests(opts, tests, |x| on_test_event(&x, &mut st, &mut *out))?;

src/bootstrap/src/utils/render_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ struct SuiteOutcome {
377377
measured: usize,
378378
filtered_out: usize,
379379
/// 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).
380+
/// (e.g. due to running on wasm).
381381
exec_time: Option<f64>,
382382
}
383383

0 commit comments

Comments
 (0)