summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-08-25 13:37:56 (GMT)
committeraxis <qt-info@nokia.com>2010-08-25 13:37:56 (GMT)
commitb237c17156a1626fada7fad50dc0892f790d6295 (patch)
treedff98c80fafc84b146ab5668add53866ed67b658 /tests/auto
parent19ebb3f5b2f599018594e9f0dd3b9de81f584262 (diff)
downloadQt-b237c17156a1626fada7fad50dc0892f790d6295.zip
Qt-b237c17156a1626fada7fad50dc0892f790d6295.tar.gz
Qt-b237c17156a1626fada7fad50dc0892f790d6295.tar.bz2
Fixed sporadically failing autotest on Symbian.
It failed because there sometimes is a spike in resource usage just after starting a process. This was fixed by adding a longer wait delay. RevBy: Trust me
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qtimer/tst_qtimer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index 8d213ed..b651187 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -161,8 +161,9 @@ void tst_QTimer::singleShotTimeout()
QCOMPARE(helper.count, 1);
}
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-// Increase wait as emulator startup can cause unexpected delays
+#if defined(Q_OS_SYMBIAN)
+// Increase wait as emulator startup can cause unexpected delays, and
+// on hardware there are sometimes spikes right after process startup.
#define TIMEOUT_TIMEOUT 2000
#else
#define TIMEOUT_TIMEOUT 200