summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwaitcondition
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@nokia.com>2010-07-22 14:30:52 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-11-02 14:23:43 (GMT)
commit185cf9f10500dc26a5fda44ca38ebeb470218cf3 (patch)
treeede44e0f7f91fc5d05ed107eb0589769e057651b /tests/auto/qwaitcondition
parent1b103adc6cb443428c5ca7833cafa6ab9da0fa37 (diff)
downloadQt-185cf9f10500dc26a5fda44ca38ebeb470218cf3.zip
Qt-185cf9f10500dc26a5fda44ca38ebeb470218cf3.tar.gz
Qt-185cf9f10500dc26a5fda44ca38ebeb470218cf3.tar.bz2
Fixed QWaitCondition autotest to use only 2 threads when running on linux and arm
Diffstat (limited to 'tests/auto/qwaitcondition')
-rw-r--r--tests/auto/qwaitcondition/tst_qwaitcondition.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
index 5391591..ffc4730 100644
--- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp
@@ -76,7 +76,7 @@ private slots:
static const int iterations = 10;
// Note: some tests rely on ThreadCount being multiple of 2
-#ifdef Q_OS_SOLARIS
+#if defined(Q_OS_SOLARIS) || ( defined(Q_OS_LINUX) && defined(QT_ARCH_ARMV6) )
static const int ThreadCount = 4;
#else
static const int ThreadCount = 10;