diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 01:00:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 01:00:11 +0200 |
| commit | 264e66afb2739b502464e6ed972207bd3ea89d22 (patch) | |
| tree | 8ea62cb4d48c900f5971c0645e70308fb6660f75 /tests | |
| parent | 1e5deb06416b6efc33a2009d9678fd8f743c5ce7 (diff) | |
| parent | d441f6bba7b2aaf1e11b95c1ad4c785e6939f6ba (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1bdc28a3ae825ea35e83f20fe16d2409515e5a3d
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/BLACKLIST | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp index 241dccb90e..aa6f0935e8 100644 --- a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp +++ b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp @@ -172,7 +172,9 @@ void tst_qfloat16::qNan() QVERIFY(qIsInf(-inf)); QVERIFY(qIsInf(2.f*inf)); QVERIFY(qIsInf(inf*2.f)); - QCOMPARE(qfloat16(1.f/inf), qfloat16(0.f)); + // QTBUG-75812: QEMU's over-optimized arm64 flakily fails 1/inf == 0 :-( + if (qfloat16(9.785e-4f) == qfloat16(9.794e-4f)) + QCOMPARE(qfloat16(1.f/inf), qfloat16(0.f)); #ifdef Q_CC_INTEL QEXPECT_FAIL("", "ICC optimizes zero * anything to zero", Continue); #endif diff --git a/tests/auto/gui/text/qfontdatabase/BLACKLIST b/tests/auto/gui/text/qfontdatabase/BLACKLIST index 7f479e4b0e..0870ca11d7 100644 --- a/tests/auto/gui/text/qfontdatabase/BLACKLIST +++ b/tests/auto/gui/text/qfontdatabase/BLACKLIST @@ -1,3 +1,2 @@ [systemFixedFont] # QTBUG-54623 -winrt b2qt |