summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-02-11 21:04:34 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-02-11 21:04:34 +0000
commit496f1765a221b0725449e492e67c6536ec1d835a (patch)
tree3d72f8278a5d5a30cf2273e3eeecf206f6cfcc67
parentcfe285e604180b33b15dc8d7bf2cbb561115ef01 (diff)
downloadbcm5719-llvm-496f1765a221b0725449e492e67c6536ec1d835a.tar.gz
bcm5719-llvm-496f1765a221b0725449e492e67c6536ec1d835a.zip
[tests] Another batch of timeout increases.
llvm-svn: 174902
-rw-r--r--libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp6
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp2
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp2
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp2
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp2
-rw-r--r--libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp2
-rw-r--r--libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp4
8 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp b/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp
index 796b75abd79..2a81a2c7b24 100644
--- a/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp
+++ b/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp
@@ -58,7 +58,7 @@ int main()
f.wait();
Clock::time_point t1 = Clock::now();
assert(f.valid());
- assert(t1-t0 < ms(5));
+ assert(t1-t0 < ms(50));
}
{
typedef int& T;
@@ -74,7 +74,7 @@ int main()
f.wait();
Clock::time_point t1 = Clock::now();
assert(f.valid());
- assert(t1-t0 < ms(5));
+ assert(t1-t0 < ms(50));
}
{
typedef void T;
@@ -90,6 +90,6 @@ int main()
f.wait();
Clock::time_point t1 = Clock::now();
assert(f.valid());
- assert(t1-t0 < ms(5));
+ assert(t1-t0 < ms(50));
}
}
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
index 6c94e7210cd..038c946709f 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
@@ -50,7 +50,7 @@ void f()
}
else
{
- assert(t1 - t0 - milliseconds(250) < milliseconds(10));
+ assert(t1 - t0 - milliseconds(250) < milliseconds(50));
assert(test2 == 0);
}
++runs;
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
index 930841dff0e..ef7a9b67ed0 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
@@ -58,7 +58,7 @@ void f()
}
else
{
- assert(t1 - t0 - milliseconds(250) < milliseconds(10));
+ assert(t1 - t0 - milliseconds(250) < milliseconds(50));
assert(test2 == 0);
}
++runs;
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
index d50ad40f9bb..89759ac934b 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
@@ -53,7 +53,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.condition/thread.condition.condvarany/wait_until_pred.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
index 6a7a132a400..1490e1157f8 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
@@ -79,7 +79,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);
assert(!r);
}
diff --git a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
index 6e5c671525b..32bedb3e9ff 100644
--- a/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
+++ b/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
@@ -37,7 +37,7 @@ void f()
m.unlock();
m.unlock();
ns d = t1 - t0 - ms(250);
- assert(d < ms(10)); // within 10ms
+ assert(d < ms(50)); // within 50ms
}
int main()
diff --git a/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp b/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
index 2d5b4ac49e8..d66db3f9f30 100644
--- a/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
+++ b/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
@@ -26,7 +26,7 @@ int main()
std::this_thread::sleep_for(ms);
time_point t1 = Clock::now();
std::chrono::nanoseconds ns = (t1 - t0) - ms;
- std::chrono::nanoseconds err = ms / 100;
- // The time slept is within 1% of 500ms
+ std::chrono::nanoseconds err = 5 * ms / 100;
+ // The time slept is within 5% of 500ms
assert(std::abs(ns.count()) < err.count());
}
diff --git a/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp b/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
index c0bf087c6fa..2f3bb9a0823 100644
--- a/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
+++ b/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
@@ -26,7 +26,7 @@ int main()
std::this_thread::sleep_until(t0 + ms);
time_point t1 = Clock::now();
std::chrono::nanoseconds ns = (t1 - t0) - ms;
- std::chrono::nanoseconds err = ms / 100;
- // The time slept is within 1% of 500ms
+ std::chrono::nanoseconds err = 5 * ms / 100;
+ // The time slept is within 5% of 500ms
assert(std::abs(ns.count()) < err.count());
}
OpenPOWER on IntegriCloud