diff options
| author | bors <bors@rust-lang.org> | 2023-04-21 15:52:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-21 15:52:10 +0000 |
| commit | 2b066a3bba88ac2dd9299410ccdbf27f5ad347e8 (patch) | |
| tree | 0133d67cbf3f69dd7cae4ab34ee3b788ca79d621 | |
| parent | f0c207f7a8dba1e5c72ac960f7586036caa8aacf (diff) | |
| parent | 28f6297d09692a385c5f0faceac98343a0e4f75f (diff) | |
| download | rust-2b066a3bba88ac2dd9299410ccdbf27f5ad347e8.tar.gz rust-2b066a3bba88ac2dd9299410ccdbf27f5ad347e8.zip | |
Auto merge of #2848 - RalfJung:tokio, r=RalfJung
disable preemption in tokio tests again The comment even still says we need preemption disabled, but the flag got lost in https://github.com/rust-lang/miri/pull/2764.
| -rw-r--r-- | src/tools/miri/tests/pass-dep/tokio/tokio_mvp.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/tests/pass-dep/tokio/tokio_mvp.rs b/src/tools/miri/tests/pass-dep/tokio/tokio_mvp.rs index 0ed2a941bc4..769a7a7d384 100644 --- a/src/tools/miri/tests/pass-dep/tokio/tokio_mvp.rs +++ b/src/tools/miri/tests/pass-dep/tokio/tokio_mvp.rs @@ -1,5 +1,5 @@ // Need to disable preemption to stay on the supported MVP codepath in mio. -//@compile-flags: -Zmiri-permissive-provenance +//@compile-flags: -Zmiri-permissive-provenance -Zmiri-preemption-rate=0 //@only-target-x86_64-unknown-linux: support for tokio exists only on linux and x86 #[tokio::main] |