From fe14b970ac1ce90da0d22aa0b83fc48298d94327 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 8 Feb 2013 17:41:19 +0000 Subject: [PATCH] [tests] Increase a bunch of wait limits. - Basically I just ran the thread tests many many times on a busy machine and bumped the timeouts whenever I hit a test failure. - This is obviously subpar, but is the best I can do without the tests being rewritten to not depend on arbitrary timeouts. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@174721 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../thread.condition.condvarany/wait_until.pass.cpp | 2 +- .../thread.lock/thread.lock.guard/adopt_lock.pass.cpp | 2 +- .../thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp | 2 +- .../thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp | 2 +- .../thread.lock.unique.cons/mutex_time_point.pass.cpp | 2 +- .../thread.mutex.class/lock.pass.cpp | 2 +- .../thread.mutex.class/try_lock.pass.cpp | 2 +- .../thread.mutex.recursive/try_lock.pass.cpp | 2 +- .../thread.timedmutex.class/try_lock.pass.cpp | 2 +- .../thread.timedmutex.class/try_lock_for.pass.cpp | 4 ++-- .../thread.timedmutex.recursive/try_lock.pass.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp b/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp index 7b21660c..15bf8095 100644 --- a/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp +++ b/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp @@ -68,7 +68,7 @@ void f() } else { - assert(t1 - t0 - Clock::duration(250) < Clock::duration(5)); + assert(t1 - t0 - Clock::duration(250) < Clock::duration(50)); assert(test2 == 0); } ++runs; diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp index 57341e87..6f688847 100644 --- a/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp +++ b/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp @@ -36,7 +36,7 @@ void f() t1 = Clock::now(); } ns d = t1 - t0 - ms(250); - assert(d < ns(2500000)); // within 2.5ms + assert(d < ms(50)); // within 50ms } int main() diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp index a0bcd387..d47222d1 100644 --- a/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp +++ b/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp @@ -35,7 +35,7 @@ void f() t1 = Clock::now(); } ns d = t1 - t0 - ms(250); - assert(d < ns(2500000)); // within 2.5ms + assert(d < ms(200)); // within 200ms } int main() diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp index 6c12e1fa..4b08aca1 100644 --- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp +++ b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp @@ -35,7 +35,7 @@ void f() t1 = Clock::now(); } ns d = t1 - t0 - ms(250); - assert(d < ns(2500000)); // within 2.5ms + assert(d < ms(50)); // within 50ms } int main() diff --git a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp index 21ee88d7..8faf88fd 100644 --- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp +++ b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp @@ -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/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp index 222ebcb0..8fde8181 100644 --- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp +++ b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp @@ -35,7 +35,7 @@ void f() time_point t1 = Clock::now(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(2500000)); // within 2.5ms + assert(d < ms(50)); // within 50ms } int main() diff --git a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp index 0d248c29..6ef01602 100644 --- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp +++ b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp @@ -37,7 +37,7 @@ void f() time_point t1 = Clock::now(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(50000000)); // within 50ms + assert(d < ms(200)); // within 200ms } int main() diff --git a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp index 2f82d4fd..f63e0ef9 100644 --- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp +++ b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp @@ -39,7 +39,7 @@ void f() m.unlock(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(50000000)); // within 50ms + assert(d < ms(200)); // within 200ms } int main() diff --git a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp index 41ddbbcf..d5a06bfc 100644 --- a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp +++ b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp @@ -37,7 +37,7 @@ void f() time_point t1 = Clock::now(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(50000000)); // within 50ms + assert(d < ms(200)); // within 200ms } int main() diff --git a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp index 1253659e..5e4d5f13 100644 --- a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp +++ b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.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_for(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/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp index fe5ef80a..d56e8bc2 100644 --- a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp +++ b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp @@ -39,7 +39,7 @@ void f() m.unlock(); m.unlock(); ns d = t1 - t0 - ms(250); - assert(d < ns(50000000)); // within 50ms + assert(d < ms(200)); // within 200ms } int main()