[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.

llvm-svn: 174721

11 files changed, 12 insertions, 12 deletions

diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
index 7b21660c162..15bf80953f1 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
index 57341e87884..6f6888478df 100644
--- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
index a0bcd387ac4..d47222d19f2 100644
--- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
index 6c12e1fa79c..4b08aca1664 100644
--- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
index 21ee88d79db..8faf88fd444 100644
--- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
index 222ebcb084e..8fde8181381 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
index 0d248c29d08..6ef01602dee 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
index 2f82d4fdb91..f63e0ef990a 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
index 41ddbbcf54a..d5a06bfcbb0 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
index 1253659e211..5e4d5f13a84 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
+++ b/libcxx/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/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
index fe5ef80a406..d56e8bc2fd2 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
+++ b/libcxx/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()