1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase tolerance for warning about QTest::qSleep() for Windows.

Browse Source 
50% is too strict, it clutters the logs.

Change-Id: Ib391064f32e39a1192e77d872cd99b7f95a5065a
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
This commit is contained in:
Friedemann Kleint 2014-04-04 15:41:56 +02:00 committed by The Qt Project
parent f0dbc6b37e
commit 19ff7d038f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/testlib/qtestcase.cpp
View File

@ -2878,7 +2878,12 @@ void QTest::qSleep(int ms)
// requested time. // requested time.
qint64 requested = 1000000 * (qint64)ms; qint64 requested = 1000000 * (qint64)ms;
qint64 diff = timer.nsecsElapsed() - requested; qint64 diff = timer.nsecsElapsed() - requested;
if (diff * 2 > requested || diff * 10 < -requested) { #ifndef Q_OS_WIN
const qint64 factor = 2; // more than 50% longer
#else
const qint64 factor = 1; // Windows: 50% is quite common, warn about 100%
#endif
if (diff * factor > requested || diff * 10 < -requested) {
QTestLog::warn(qPrintable( QTestLog::warn(qPrintable(
QString::fromLatin1("QTest::qSleep() should have taken %1ns, but actually took %2ns!") QString::fromLatin1("QTest::qSleep() should have taken %1ns, but actually took %2ns!")
.arg(requested).arg(diff + requested)), __FILE__, __LINE__); .arg(requested).arg(diff + requested)), __FILE__, __LINE__);