From 584a65befdc0ab8f458a9b4bf6e49c5ac590ebfd Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Wed, 6 Feb 2013 20:25:56 +0000 Subject: [PATCH] Give a lot more timing latitude to some of the timing tests. Busy buildbots are hitting the timing limits too often. llvm-svn: 174539 --- .../thread.condition.condvarany/wait_for_pred.pass.cpp | 2 +- .../thread.lock.unique.cons/mutex_duration.pass.cpp | 4 ++-- .../thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp | 2 +- .../thread.timedmutex.class/try_lock_until.pass.cpp | 4 ++-- .../thread.timedmutex.recursive/try_lock_until.pass.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp index 856297d..bc4b7c3 100644 --- a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp +++ b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp @@ -61,7 +61,7 @@ void f() } else { - assert(t1 - t0 - milliseconds(250) < milliseconds(5)); + assert(t1 - t0 - milliseconds(250) < milliseconds(50)); assert(test2 == 0); } ++runs; diff --git a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp index 137c913..8370c56 100644 --- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp +++ b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp @@ -34,7 +34,7 @@ void f1() assert(lk.owns_lock() == true); time_point t1 = Clock::now(); ns d = t1 - t0 - ms(250); - assert(d < ns(5000000)); // within 5ms + assert(d < ms(50)); // within 50ms } void f2() @@ -44,7 +44,7 @@ void f2() assert(lk.owns_lock() == false); time_point t1 = Clock::now(); ns d = t1 - t0 - ms(250); - assert(d < ns(5000000)); // within 5ms + assert(d < ms(50)); // within 50ms } int main() diff --git a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp index fa50c7b..c101d89 100644 --- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp +++ b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp @@ -34,7 +34,7 @@ void f() time_point t1 = Clock::now(); assert(lk.owns_lock() == true); ns d = t1 - t0 - ms(250); - assert(d < ns(2500000)); // within 2.5ms + assert(d < ms(25)); // within 25ms try { lk.lock(); diff --git a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp index ac70d4a..f19dec2 100644 --- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp +++ b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp @@ -34,7 +34,7 @@ void f1() time_point t1 = Clock::now(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(5000000)); // within 5ms + assert(d < ms(50)); // within 50ms } void f2() @@ -43,7 +43,7 @@ void f2() assert(m.try_lock_until(Clock::now() + ms(250)) == false); time_point t1 = Clock::now(); ns d = t1 - t0 - ms(250); - assert(d < ns(5000000)); // within 5ms + assert(d < ms(50)); // within 50ms } int main() diff --git a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp index bfda9ed..e5e9166 100644 --- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp +++ b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp @@ -36,7 +36,7 @@ void f1() m.unlock(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(5000000)); // within 5ms + assert(d < ms(50)); // within 50ms } void f2() @@ -45,7 +45,7 @@ void f2() assert(m.try_lock_until(Clock::now() + ms(250)) == false); time_point t1 = Clock::now(); ns d = t1 - t0 - ms(250); - assert(d < ns(5000000)); // within 5ms + assert(d < ms(50)); // within 50ms } int main() -- 2.7.4