diff options
author | Caroline Chao <caroline.chao@digia.com> | 2012-10-16 12:29:03 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-16 20:43:37 +0200 |
commit | c35c913916aa9af99f530c08be297263b947e0d6 (patch) | |
tree | 571e0467ee641851dea83012cdb2f9c713a96579 | |
parent | fdc9ce5908ee47f9f5adac2d49899a4de887ccd5 (diff) |
Test: remove QSKIP from tst_QThread::stressTest
Instead omit the whole test when Q_OS_WINCE is defined.
Change-Id: Id6f4e65c994115b8bab45f9fbf21dd255d204ea6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 663a1f9c3c..d7b810858d 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -106,7 +106,9 @@ private slots: void customEventDispatcher(); +#ifndef Q_OS_WINCE void stressTest(); +#endif void quitLock(); }; @@ -949,11 +951,11 @@ void tst_QThread::adoptMultipleThreadsOverlap() QVERIFY(!QTestEventLoop::instance().timeout()); QCOMPARE(recorder.activationCount.load(), numThreads); } + +#ifndef Q_OS_WINCE +// Disconnects on WinCE void tst_QThread::stressTest() { -#if defined(Q_OS_WINCE) - QSKIP("Disconnects on WinCE, skipping..."); -#endif QTime t; t.start(); while (t.elapsed() < one_minute) { @@ -962,6 +964,7 @@ void tst_QThread::stressTest() t.wait(one_minute); } } +#endif class Syncronizer : public QObject { Q_OBJECT |