summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-12-23 15:18:16 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-28 06:34:15 +0100
commit36eb666391ec4d51ab1a9d6d1a4125bdcfd2bcbf (patch)
treeee1c778432e922bd59426a43ce24b21018b28ba8 /tests
parent79b64957b00f027673782e88eae8518b8c5be79e (diff)
Improve qtconcurrentthreadengine autotest.
The threadCount() test function is unstable and had been disabled by making it not be a slot. It is better to disable it with QSKIP so that the test output shows that the test function exists and is in need of repair. Change-Id: Iccdc8da31e0d15d922f7e9606835d1ff1a3a4966 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index e020190ae3..d1350ba84a 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -48,14 +48,13 @@ using namespace QtConcurrent;
class tst_QtConcurrentThreadEngine: public QObject
{
Q_OBJECT
-public:
- void threadCount();
private slots:
void runDirectly();
void result();
void runThroughStarter();
void cancel();
void throttle();
+ void threadCount();
void multipleResults();
void stresstest();
void cancelQueuedSlowUser();
@@ -279,6 +278,8 @@ public:
void tst_QtConcurrentThreadEngine::threadCount()
{
+ QSKIP("QTBUG-23333: This test is unstable");
+
const int repeats = 10;
for (int i = 0; i < repeats; ++i) {
ThreadCountUser t;