summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/thread
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-06 18:56:31 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-07 04:30:30 +0200
commit924d810dbdcd5b5b0fa860922b2487ea9062d002 (patch)
treeb14117ac5b9a2d8d02a502adbd00b94ba5eef424 /tests/auto/corelib/thread
parent13251dcaea443d2f228fc797e54318191048e588 (diff)
Avoid using QSKIP in lieu of compile-time checks
QSKIP is intended to be used to skip test functions that are found at run-time to be inapplicable or unsafe. If a test function can be determined to be inapplicable at compile-time, the entire test function should be omitted instead of replacing the body of the test function with a QSKIP, which only serves to slow down test runs and to inflate test run-rates with empty, inapplicable tests. Task-number: QTQAINFRA-278 Change-Id: I95feba3edbfa092c0ef4d85bb8c6877bd6be698e Reviewed-on: http://codereview.qt-project.org/6128 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/thread')
-rw-r--r--tests/auto/corelib/thread/qthread/tst_qthread.cpp9
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 9600afd220..b2d09f2baf 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -117,7 +117,9 @@ private slots:
void startFinishRace();
void startAndQuitCustomEventLoop();
+#ifndef Q_OS_WINCE
void stressTest();
+#endif
};
enum { one_minute = 60 * 1000, five_minutes = 5 * one_minute };
@@ -990,11 +992,11 @@ void tst_QThread::adoptMultipleThreadsOverlap()
QVERIFY(!QTestEventLoop::instance().timeout());
QCOMPARE(int(recorder.activationCount), numThreads);
}
+
+// Disconnects on WinCE, so skip this test.
+#ifndef Q_OS_WINCE
void tst_QThread::stressTest()
{
-#if defined(Q_OS_WINCE)
- QSKIP("Disconnects on WinCE, skipping...", SkipAll);
-#endif
QTime t;
t.start();
while (t.elapsed() < one_minute) {
@@ -1003,6 +1005,7 @@ void tst_QThread::stressTest()
t.wait(one_minute);
}
}
+#endif
class Syncronizer : public QObject
{ Q_OBJECT