Auto merge of rust-lang#2355 - RalfJung:rustup, r=RalfJung

make a test deterministic
rust-lang-ci · Jul 11, 2022 · b994fea · b994fea
2 parents aada09f + 444ba75
commit b994fea
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 3 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-1517f5de01c445b5124b30f02257b02b4c5ef3b2
+c396bb3b8a16b1f2762b7c6078dc3e023f6a2493
diff --git a/tests/fail/data_race/atomic_read_na_write_race1.rs b/tests/fail/data_race/atomic_read_na_write_race1.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 

diff --git a/tests/fail/data_race/atomic_read_na_write_race2.rs b/tests/fail/data_race/atomic_read_na_write_race2.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;

diff --git a/tests/fail/data_race/atomic_write_na_read_race1.rs b/tests/fail/data_race/atomic_write_na_read_race1.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;

diff --git a/tests/fail/data_race/atomic_write_na_read_race2.rs b/tests/fail/data_race/atomic_write_na_read_race2.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 

diff --git a/tests/fail/data_race/atomic_write_na_write_race1.rs b/tests/fail/data_race/atomic_write_na_write_race1.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 

diff --git a/tests/fail/data_race/atomic_write_na_write_race2.rs b/tests/fail/data_race/atomic_write_na_write_race2.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;

diff --git a/tests/fail/data_race/dangling_thread_async_race.rs b/tests/fail/data_race/dangling_thread_async_race.rs
@@ -1,5 +1,6 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
-//@compile-flags: -Zmiri-disable-isolation
 
 use std::mem;
 use std::thread::{sleep, spawn};

diff --git a/tests/fail/data_race/dangling_thread_race.rs b/tests/fail/data_race/dangling_thread_race.rs
@@ -1,5 +1,6 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
-//@compile-flags: -Zmiri-disable-isolation
 
 use std::mem;
 use std::thread::{sleep, spawn};

diff --git a/tests/fail/data_race/dealloc_read_race1.rs b/tests/fail/data_race/dealloc_read_race1.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/data_race/dealloc_read_race2.rs b/tests/fail/data_race/dealloc_read_race2.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/data_race/dealloc_write_race1.rs b/tests/fail/data_race/dealloc_write_race1.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/data_race/dealloc_write_race2.rs b/tests/fail/data_race/dealloc_write_race2.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/data_race/enable_after_join_to_main.rs b/tests/fail/data_race/enable_after_join_to_main.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/data_race/read_write_race.rs b/tests/fail/data_race/read_write_race.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/data_race/write_write_race.rs b/tests/fail/data_race/write_write_race.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;

diff --git a/tests/fail/weak_memory/racing_mixed_size.rs b/tests/fail/weak_memory/racing_mixed_size.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 #![feature(core_intrinsics)]

diff --git a/tests/fail/weak_memory/racing_mixed_size_read.rs b/tests/fail/weak_memory/racing_mixed_size_read.rs
@@ -1,3 +1,5 @@
+// We want to control preemption here.
+//@compile-flags: -Zmiri-preemption-rate=0
 //@ignore-windows: Concurrency on Windows is not supported yet.
 
 #![feature(core_intrinsics)]