diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:46:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:51:11 +0100 |
| commit | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (patch) | |
| tree | 9ca3819e5cca9b7e61f305a874b682e5a2085e83 /tests/auto/corelib/kernel | |
| parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
| parent | de225ccdf95efb57866d62bc80872c1a2ab99703 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/plugin/qlibrary_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb
Diffstat (limited to 'tests/auto/corelib/kernel')
| -rw-r--r-- | tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qtimer/BLACKLIST | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp index 9db001c37d..4ee3ca361f 100644 --- a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp +++ b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp @@ -31,7 +31,7 @@ #include <QtCore/QElapsedTimer> #include <QtTest/QtTest> -static const int minResolution = 50; // the minimum resolution for the tests +static const int minResolution = 100; // the minimum resolution for the tests QDebug operator<<(QDebug s, const QElapsedTimer &t) { @@ -107,7 +107,7 @@ void tst_QElapsedTimer::elapsed() QElapsedTimer t1; t1.start(); - QTest::qSleep(4*minResolution); + QTest::qSleep(2*minResolution); QElapsedTimer t2; t2.start(); @@ -128,8 +128,8 @@ void tst_QElapsedTimer::elapsed() QVERIFY(!t2.hasExpired(-1)); qint64 elapsed = t1.restart(); - QVERIFY(elapsed > 3*minResolution); - QVERIFY(elapsed < 5*minResolution); + QVERIFY(elapsed > minResolution); + QVERIFY(elapsed < 3*minResolution); qint64 diff = t2.msecsTo(t1); QVERIFY(diff < minResolution); } diff --git a/tests/auto/corelib/kernel/qtimer/BLACKLIST b/tests/auto/corelib/kernel/qtimer/BLACKLIST new file mode 100644 index 0000000000..e5136624d8 --- /dev/null +++ b/tests/auto/corelib/kernel/qtimer/BLACKLIST @@ -0,0 +1,3 @@ +[remainingTime] +windows +osx |