Cleanup corelib autotests

Remove various disabled and/or non-helpful debugging code.

Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.  Diagnostics should also be informative -- simply
printing the value of a variable with no other information about what is
being printed (or why it is being printed) is not informative.

Change-Id: I21a6c2121be86001bb57e80f426507b6e619ee9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

3 files changed, 0 insertions, 12 deletions

diff --git a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
index 0ea5478947..2457504c38 100644
--- a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
@@ -1165,32 +1165,27 @@ public:
 public slots:
     void finished()
     {
-//        qDebug() << "finished called";
         finishedCalled = true;
     }
 
     void canceled()
     {
-//        qDebug() << "canceled called";
         canceledCalled = true;
     }
 
     void resultReady(int index)
     {
-//        qDebug() << "result" << index << "ready";
         results.insert(index);
     }
 
     void progressRange(int begin, int end)
     {
-//        qDebug() << "progress range" << begin << end;
         rangeBegin = begin;
         rangeEnd = end;
     }
 
     void progress(int progress)
     {
-//        qDebug() << "progress" << progress;
         reportedProgress.insert(progress);
     }
 public:
diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 5cbdeccf11..c18dad93a3 100644
--- a/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -2171,14 +2171,12 @@ InstanceCounter slowMap(const InstanceCounter &in)
 InstanceCounter fastMap(const InstanceCounter &in)
 {
     QTest::qSleep(rand() % 2 + 1);
-//    qDebug() << "map   " << QThread::currentThread();
     return in;
 }
 
 void slowReduce(int &result, const InstanceCounter&)
 {
     QTest::qSleep(rand() % 4 + 1);
-//    qDebug() << "reduce" << QThread::currentThread();
     ++result;
 }
 
@@ -2204,8 +2202,6 @@ void tst_QtConcurrentMap::throttling()
 
         int results = QtConcurrent::blockingMappedReduced(instances, slowMap, fastReduce);
         QCOMPARE(results, itemcount);
-        qDebug() << (int)currentInstanceCount;
-        qDebug() << (int)peakInstanceCount;
         QCOMPARE(int(currentInstanceCount), itemcount);
         QVERIFY(int(peakInstanceCount) < itemcount + allowedTemporaries);
     }
@@ -2222,8 +2218,6 @@ void tst_QtConcurrentMap::throttling()
         int results = QtConcurrent::blockingMappedReduced(instances, fastMap, slowReduce);
 
         QCOMPARE(results, itemcount);
-        qDebug() << (int)currentInstanceCount;
-        qDebug() << (int)peakInstanceCount;
         QCOMPARE((int)currentInstanceCount, itemcount);
         QVERIFY(int(peakInstanceCount) < itemcount + allowedTemporaries);
     }
diff --git a/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
index 6f58bf56a2..8326814f9d 100644
--- a/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
@@ -719,7 +719,6 @@ void tst_QThreadPool::tryStartCount()
     const int runs = 5;
 
     for (int i = 0; i < runs; ++i) {
-//        qDebug() << "iteration" << i;
         int count = 0;
         while (threadPool.tryStart(&task))
             ++count;