From dcb2b30982352362a0f10cbd45be298b31306eff Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 3 Jun 2020 09:40:21 +0200 Subject: [PATCH] rustup, and adjust timing tests --- rust-version | 2 +- tests/run-pass/concurrency/libc_pthread_cond.rs | 2 ++ tests/run-pass/concurrency/sync.rs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rust-version b/rust-version index daae7a34d04..d163c316228 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -d3cba254e464303a6495942f3a831c2bbd7f1768 +680a4b2fbdca0dc6c5ceec826a8dbeabe28f305d diff --git a/tests/run-pass/concurrency/libc_pthread_cond.rs b/tests/run-pass/concurrency/libc_pthread_cond.rs index 27f5ead450f..8aa3b210f4b 100644 --- a/tests/run-pass/concurrency/libc_pthread_cond.rs +++ b/tests/run-pass/concurrency/libc_pthread_cond.rs @@ -25,6 +25,8 @@ fn test_timed_wait_timeout(clock_id: i32) { let mut now: libc::timespec = mem::zeroed(); assert_eq!(libc::clock_gettime(clock_id, &mut now), 0); + // Waiting for a second... mostly because waiting less requires mich more tricky arithmetic. + // FIXME: wait less. let timeout = libc::timespec { tv_sec: now.tv_sec + 1, tv_nsec: now.tv_nsec }; assert_eq!(libc::pthread_mutex_lock(&mut mutex as *mut _), 0); diff --git a/tests/run-pass/concurrency/sync.rs b/tests/run-pass/concurrency/sync.rs index e36c79491f9..b36ad27ebe1 100644 --- a/tests/run-pass/concurrency/sync.rs +++ b/tests/run-pass/concurrency/sync.rs @@ -109,7 +109,7 @@ fn check_conditional_variables_timed_wait_notimeout() { cvar.notify_one(); }); - let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(100)).unwrap(); + let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(200)).unwrap(); assert!(!timeout.timed_out()); handle.join().unwrap(); } -- 2.44.0