rustup; more slack for timing tests

diff --git a/rust-version b/rust-version
index d4006f955da5431420de8bd36b51968c95e1b8c4..af4bc45869dcdd7664dd87ba323b597969aac71e 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-a8f707553276a15565860af3d415aae18428aa96
+78e22069d018e83915201c8a218a0a94227f6420

diff --git a/tests/run-pass/concurrency/sync.rs b/tests/run-pass/concurrency/sync.rs
index e97da415cbb1c08d026c47416edb69928b29cb6c..88187d64e604a6c5c8a33049fe420d03a3cc18a9 100644 (file)
--- a/tests/run-pass/concurrency/sync.rs
+++ b/tests/run-pass/concurrency/sync.rs
@@ -92,7 +92,7 @@ fn check_conditional_variables_timed_wait_timeout() {
     let (_guard, timeout) = cvar.wait_timeout(guard, Duration::from_millis(100)).unwrap();
     assert!(timeout.timed_out());
     let elapsed_time = now.elapsed().as_millis();
-    assert!(100 <= elapsed_time && elapsed_time <= 300);
+    assert!(100 <= elapsed_time && elapsed_time <= 500);
 }
 
 /// Test that signaling a conditional variable when waiting with a timeout works