From 36eb666391ec4d51ab1a9d6d1a4125bdcfd2bcbf Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 23 Dec 2011 15:18:16 +1000
Subject: 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>
---
 .../qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/auto')

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;
-- 
cgit v1.2.3