Skip to content

Commit

Permalink
Auto merge of rust-lang#2848 - RalfJung:tokio, r=RalfJung
Browse files Browse the repository at this point in the history
disable preemption in tokio tests again

The comment even still says we need preemption disabled, but the flag got lost in rust-lang/miri#2764.
  • Loading branch information
bors committed Apr 21, 2023
2 parents f0c207f + 28f6297 commit 2b066a3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri/tests/pass-dep/tokio/tokio_mvp.rs
Original file line number Diff line number Diff line change
@@ -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]
Expand Down

0 comments on commit 2b066a3

Please sign in to comment.