summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-06 09:40:12 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-07 02:38:53 (GMT)
commit3cd593ee216310b507a298e33e91ce0b292fde55 (patch)
tree83aa4df2e513fb34bcd5636b96e9764b7caefc36
parentbae13dce935ed627c4ae5c165172d38b33d6fe1a (diff)
downloadQt-3cd593ee216310b507a298e33e91ce0b292fde55.zip
Qt-3cd593ee216310b507a298e33e91ce0b292fde55.tar.gz
Qt-3cd593ee216310b507a298e33e91ce0b292fde55.tar.bz2
Stabilize QWaitCondition test.
Wait a little bit more for thread synchronization Reviewed-by: Brad (cherry picked from commit 7a8503d179e0f9afebb2ca57e824f1be61becf17)
-rw-r--r--tests/auto/qwaitcondition/tst_qwaitcondition.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
index c2bbe22..f534f3b 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
@@ -491,7 +491,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
- if (thread[y].wait(exited > 0 ? 1 : 1000)) {
+ if (thread[y].wait(exited > 0 ? 3 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}
@@ -535,7 +535,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
- if (rwthread[y].wait(exited > 0 ? 1 : 1000)) {
+ if (rwthread[y].wait(exited > 0 ? 3 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}
@@ -587,7 +587,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
- if (thread[y].wait(exited > 0 ? 1 : 1000)) {
+ if (thread[y].wait(exited > 0 ? 3 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}
@@ -633,7 +633,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
- if (rwthread[y].wait(exited > 0 ? 1 : 1000)) {
+ if (rwthread[y].wait(exited > 0 ? 3 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}