user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #2553 - RalfJung:macos-is-a-pain, r=RalfJung

Browse source 
make a sync test more reliable

CI still failed in https://github.com/rust-lang/miri/actions/runs/3088146532/jobs/4994285794, with a 2 second timeout?!??
This commit is contained in:
bors 2022-09-20 08:19:56 +00:00
commit eb84c8b621
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/pass/concurrency/sync.rs
View file

@ -77,13 +77,12 @@ fn check_conditional_variables_timed_wait_notimeout() {
let guard = lock.lock().unwrap();
let handle = thread::spawn(move || {
thread::sleep(Duration::from_millis(100)); // Make sure the other thread is waiting by the time we call `notify`.
let (_lock, cvar) = &*pair2;
cvar.notify_one();
});
// macOS runners are very unreliable.
let timeout = if cfg!(target_os = "macos") { 2000 } else { 500 };
let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(timeout)).unwrap();
let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(500)).unwrap();
assert!(!timeout.timed_out());
handle.join().unwrap();
}