diff options
| author | ninerider <qt-info@nokia.com> | 2009-10-08 12:16:05 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-10-08 12:16:05 (GMT) |
| commit | cbd0020a4db3c67bb73f6c42ec2ce06a710b00db (patch) | |
| tree | a5b3c99e400919734d7b45e0e498b572b1788518 | |
| parent | e1f7d33dcd8267fd2fc9658df6245ca30df3741e (diff) | |
| download | Qt-cbd0020a4db3c67bb73f6c42ec2ce06a710b00db.zip Qt-cbd0020a4db3c67bb73f6c42ec2ce06a710b00db.tar.gz Qt-cbd0020a4db3c67bb73f6c42ec2ce06a710b00db.tar.bz2 | |
Non-Zero timer livelock test expected to fail on Windows CE
Timing issues prevent this test from working correctly on Windows CE.
Reviewed-by: Joerg
| -rw-r--r-- | tests/auto/qtimer/tst_qtimer.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index 0877500..01a6317 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -46,10 +46,6 @@ #include <qtimer.h> #include <qthread.h> - - - - #if defined Q_OS_UNIX #include <unistd.h> #endif @@ -242,7 +238,6 @@ public: // sleep for 2ms QTest::qSleep(2); - killTimer(te->timerId()); } @@ -277,9 +272,11 @@ void tst_QTimer::livelock() #elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) QEXPECT_FAIL("zero timer", "", Continue); QEXPECT_FAIL("non-zero timer", "", Continue); -#elif defined(Q_OS_WIN) +#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE) if (QSysInfo::WindowsVersion < QSysInfo::WV_XP) QEXPECT_FAIL("non-zero timer", "Multimedia timers are not available on Windows 2000", Continue); +#elif defined(Q_OS_WINCE) + QEXPECT_FAIL("non-zero timer", "Windows CE devices often too slow", Continue); #endif QVERIFY(tester.postEventAtRightTime); } |