AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QThreadPool::tryStartCount(): Wait until tasks have finished.

Browse Source 
Replace hardcoded interval by QTRY_COMPARE() ensuring that all tasks have
finished, since otherwise QThreadPool::tryStart() fails in the next run.

Remove blacklisting for MSVC2012 since it is not compiler-specific.

Task-number: QTBUG-49654
Change-Id: If49b6eb9ef4da4ba2911839166c397d84c175e00
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-11-27 10:33:19 +01:00
parent 28beaf63cd
commit 45f7512bf5
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/thread/qthreadpool/BLACKLIST
View File

@ -1,5 +1,2 @@
[expiryTimeoutRace]
osx
[tryStartCount]
windows msvc-2012
linux

2
tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
View File

@ -821,7 +821,7 @@ void tst_QThreadPool::tryStartCount()
++count;
QCOMPARE(count, QThread::idealThreadCount());
QTest::qWait(100);
QTRY_COMPARE(threadPool.activeThreadCount(), 0);
}
}