QtTestLib: handle float16 the same as double and float

In QCOMPARE, handle NaNs and infinities the way tests want them
handled, rather than by strict IEEE rules. In particular, if a test
expects NaN, this lets it treat that just like any other expected
value, despite NaN != NaN as float16 values. Likewise, format
infinities and NaNs specially in toString() so that they're reported
consistently.

Enable the qfloat16 tests that depend on this QCOMPARE() behavior.
Refise the testlib selftest's float test to test qfloat16 the same way
it tests float and double (and format the test the same way).

This is a follow-up to 37f617c405a.

Change-Id: I433256a09b1657e6725d68d07c5f80d805bf586a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

9 files changed, 1054 insertions, 63 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index db44b3860a..cad29b5326 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2539,7 +2539,8 @@ static bool floatingCompare(const T &t1, const T &t2)
 bool QTest::qCompare(qfloat16 const &t1, qfloat16 const &t2, const char *actual, const char *expected,
                      const char *file, int line)
 {
-    return compare_helper(qFuzzyCompare(t1, t2), "Compared qfloat16s are not the same (fuzzy compare)",
+    return compare_helper(floatingCompare(t1, t2),
+                          "Compared qfloat16s are not the same (fuzzy compare)",
                           toString(t1), toString(t2), actual, expected, file, line);
 }
 
@@ -2646,16 +2647,10 @@ template <> Q_TESTLIB_EXPORT char *QTest::toString<TYPE>(const TYPE &t) \
     return msg; \
 }
 
+TO_STRING_FLOAT(qfloat16, %.3g)
 TO_STRING_FLOAT(float, %g)
 TO_STRING_FLOAT(double, %.12g)
 
-template <> Q_TESTLIB_EXPORT char *QTest::toString<qfloat16>(const qfloat16 &t)
-{
-    char *msg = new char[16];
-    qsnprintf(msg, 16, "%.3g", static_cast<float>(t));
-    return msg;
-}
-
 template <> Q_TESTLIB_EXPORT char *QTest::toString<char>(const char &t)
 {
     unsigned char c = static_cast<unsigned char>(t);
diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
index b82751cfb5..6894fd4cc3 100644
--- a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
+++ b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
@@ -454,7 +454,7 @@ void tst_qfloat16::limits()
     QVERIFY(qIsInf(Bounds::infinity()));
     QVERIFY(!qIsNaN(Bounds::infinity()));
     QVERIFY(!qIsFinite(Bounds::infinity()));
-    // QCOMPARE(Bounds::infinity(), Bounds::infinity());
+    QCOMPARE(Bounds::infinity(), Bounds::infinity());
     QCOMPARE(qFpClassify(Bounds::infinity()), FP_INFINITE);
 
     QVERIFY(Bounds::infinity() > -Bounds::infinity());
@@ -462,7 +462,7 @@ void tst_qfloat16::limits()
     QVERIFY(qIsInf(-Bounds::infinity()));
     QVERIFY(!qIsNaN(-Bounds::infinity()));
     QVERIFY(!qIsFinite(-Bounds::infinity()));
-    // QCOMPARE(-Bounds::infinity(), -Bounds::infinity());
+    QCOMPARE(-Bounds::infinity(), -Bounds::infinity());
     QCOMPARE(qFpClassify(-Bounds::infinity()), FP_INFINITE);
 
     QVERIFY(-Bounds::infinity() < zero);
@@ -470,7 +470,7 @@ void tst_qfloat16::limits()
     QVERIFY(!qIsInf(Bounds::quiet_NaN()));
     QVERIFY(!qIsFinite(Bounds::quiet_NaN()));
     QVERIFY(!(Bounds::quiet_NaN() == Bounds::quiet_NaN()));
-    // QCOMPARE(Bounds::quiet_NaN(), Bounds::quiet_NaN());
+    QCOMPARE(Bounds::quiet_NaN(), Bounds::quiet_NaN());
     QCOMPARE(qFpClassify(Bounds::quiet_NaN()), FP_NAN);
 
     QVERIFY(Bounds::max() > zero);
diff --git a/tests/auto/testlib/selftests/expected_float.lightxml b/tests/auto/testlib/selftests/expected_float.lightxml
index 54d6eabdbd..5f5114bb2e 100644
--- a/tests/auto/testlib/selftests/expected_float.lightxml
+++ b/tests/auto/testlib/selftests/expected_float.lightxml
@@ -428,21 +428,24 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="float16Comparisons">
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[should SUCCEED 1]]></DataTag>
-</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
     <DataTag><![CDATA[should FAIL 1]]></DataTag>
     <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
    Expected (operandRight): 3]]></Description>
 </Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS 1]]></DataTag>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
     <DataTag><![CDATA[should FAIL 2]]></DataTag>
     <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0.0001
    Expected (operandRight): 0.0003]]></Description>
 </Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS 2]]></DataTag>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
     <DataTag><![CDATA[should FAIL 3]]></DataTag>
     <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
@@ -450,7 +453,187 @@
    Expected (operandRight): 99]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[should SUCCEED 2]]></DataTag>
+    <DataTag><![CDATA[should PASS 3]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL 4]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.93e-05
+   Expected (operandRight): 5.87e-05]]></Description>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS 4]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL 5]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.94e+04
+   Expected (operandRight): 5.88e+04]]></Description>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS: NaN == NaN]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: NaN != 0]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 0]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 0 != NaN]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: NaN != 1]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 1]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 1 != NaN]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS: inf == inf]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS: -inf == -inf]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != nan]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: nan != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != nan]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: nan != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != 0]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 0]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 0 != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != 0]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 0]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 0 != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != 1]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 1]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 1 != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != 1]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 1]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 1 != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != -max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): -6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: max != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -max != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -6.55e+04
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != -max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): -6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: max != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -max != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -6.55e+04
+   Expected (operandRight): -inf]]></Description>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_float.tap b/tests/auto/testlib/selftests/expected_float.tap
index 4a3b3906c2..9da51b93b3 100644
--- a/tests/auto/testlib/selftests/expected_float.tap
+++ b/tests/auto/testlib/selftests/expected_float.tap
@@ -759,8 +759,7 @@ not ok 77 - floatComparisons(should FAIL: -max != -inf)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
   line: 137
   ...
-ok 78 - float16Comparisons(should SUCCEED 1)
-not ok 79 - float16Comparisons(should FAIL 1)
+not ok 78 - float16Comparisons(should FAIL 1)
   ---
   type: QCOMPARE
   message: Compared qfloat16s are not the same (fuzzy compare)
@@ -772,6 +771,7 @@ not ok 79 - float16Comparisons(should FAIL 1)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
   line: 171
   ...
+ok 79 - float16Comparisons(should PASS 1)
 not ok 80 - float16Comparisons(should FAIL 2)
   ---
   type: QCOMPARE
@@ -784,7 +784,8 @@ not ok 80 - float16Comparisons(should FAIL 2)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
   line: 171
   ...
-not ok 81 - float16Comparisons(should FAIL 3)
+ok 81 - float16Comparisons(should PASS 2)
+not ok 82 - float16Comparisons(should FAIL 3)
   ---
   type: QCOMPARE
   message: Compared qfloat16s are not the same (fuzzy compare)
@@ -796,8 +797,348 @@ not ok 81 - float16Comparisons(should FAIL 3)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
   line: 171
   ...
-ok 82 - float16Comparisons(should SUCCEED 2)
-not ok 83 - compareFloatTests(1e0)
+ok 83 - float16Comparisons(should PASS 3)
+not ok 84 - float16Comparisons(should FAIL 4)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 5.87e-05 (operandRight)
+  found: 5.93e-05 (operandLeft)
+  expected: 5.87e-05 (operandRight)
+  actual: 5.93e-05 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+ok 85 - float16Comparisons(should PASS 4)
+not ok 86 - float16Comparisons(should FAIL 5)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 5.88e+04 (operandRight)
+  found: 5.94e+04 (operandLeft)
+  expected: 5.88e+04 (operandRight)
+  actual: 5.94e+04 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+ok 87 - float16Comparisons(should PASS: NaN == NaN)
+not ok 88 - float16Comparisons(should FAIL: NaN != 0)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 0 (operandRight)
+  found: nan (operandLeft)
+  expected: 0 (operandRight)
+  actual: nan (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 89 - float16Comparisons(should FAIL: 0 != NaN)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: nan (operandRight)
+  found: 0 (operandLeft)
+  expected: nan (operandRight)
+  actual: 0 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 90 - float16Comparisons(should FAIL: NaN != 1)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 1 (operandRight)
+  found: nan (operandLeft)
+  expected: 1 (operandRight)
+  actual: nan (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 91 - float16Comparisons(should FAIL: 1 != NaN)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: nan (operandRight)
+  found: 1 (operandLeft)
+  expected: nan (operandRight)
+  actual: 1 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+ok 92 - float16Comparisons(should PASS: inf == inf)
+ok 93 - float16Comparisons(should PASS: -inf == -inf)
+not ok 94 - float16Comparisons(should FAIL: inf != -inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -inf (operandRight)
+  found: inf (operandLeft)
+  expected: -inf (operandRight)
+  actual: inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 95 - float16Comparisons(should FAIL: -inf != inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: inf (operandRight)
+  found: -inf (operandLeft)
+  expected: inf (operandRight)
+  actual: -inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 96 - float16Comparisons(should FAIL: inf != nan)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: nan (operandRight)
+  found: inf (operandLeft)
+  expected: nan (operandRight)
+  actual: inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 97 - float16Comparisons(should FAIL: nan != inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: inf (operandRight)
+  found: nan (operandLeft)
+  expected: inf (operandRight)
+  actual: nan (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 98 - float16Comparisons(should FAIL: -inf != nan)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: nan (operandRight)
+  found: -inf (operandLeft)
+  expected: nan (operandRight)
+  actual: -inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 99 - float16Comparisons(should FAIL: nan != -inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -inf (operandRight)
+  found: nan (operandLeft)
+  expected: -inf (operandRight)
+  actual: nan (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 100 - float16Comparisons(should FAIL: inf != 0)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 0 (operandRight)
+  found: inf (operandLeft)
+  expected: 0 (operandRight)
+  actual: inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 101 - float16Comparisons(should FAIL: 0 != inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: inf (operandRight)
+  found: 0 (operandLeft)
+  expected: inf (operandRight)
+  actual: 0 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 102 - float16Comparisons(should FAIL: -inf != 0)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 0 (operandRight)
+  found: -inf (operandLeft)
+  expected: 0 (operandRight)
+  actual: -inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 103 - float16Comparisons(should FAIL: 0 != -inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -inf (operandRight)
+  found: 0 (operandLeft)
+  expected: -inf (operandRight)
+  actual: 0 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 104 - float16Comparisons(should FAIL: inf != 1)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 1 (operandRight)
+  found: inf (operandLeft)
+  expected: 1 (operandRight)
+  actual: inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 105 - float16Comparisons(should FAIL: 1 != inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: inf (operandRight)
+  found: 1 (operandLeft)
+  expected: inf (operandRight)
+  actual: 1 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 106 - float16Comparisons(should FAIL: -inf != 1)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 1 (operandRight)
+  found: -inf (operandLeft)
+  expected: 1 (operandRight)
+  actual: -inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 107 - float16Comparisons(should FAIL: 1 != -inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -inf (operandRight)
+  found: 1 (operandLeft)
+  expected: -inf (operandRight)
+  actual: 1 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 108 - float16Comparisons(should FAIL: inf != max)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 6.55e+04 (operandRight)
+  found: inf (operandLeft)
+  expected: 6.55e+04 (operandRight)
+  actual: inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 109 - float16Comparisons(should FAIL: inf != -max)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -6.55e+04 (operandRight)
+  found: inf (operandLeft)
+  expected: -6.55e+04 (operandRight)
+  actual: inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 110 - float16Comparisons(should FAIL: max != inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: inf (operandRight)
+  found: 6.55e+04 (operandLeft)
+  expected: inf (operandRight)
+  actual: 6.55e+04 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 111 - float16Comparisons(should FAIL: -max != inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: inf (operandRight)
+  found: -6.55e+04 (operandLeft)
+  expected: inf (operandRight)
+  actual: -6.55e+04 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 112 - float16Comparisons(should FAIL: -inf != max)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: 6.55e+04 (operandRight)
+  found: -inf (operandLeft)
+  expected: 6.55e+04 (operandRight)
+  actual: -inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 113 - float16Comparisons(should FAIL: -inf != -max)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -6.55e+04 (operandRight)
+  found: -inf (operandLeft)
+  expected: -6.55e+04 (operandRight)
+  actual: -inf (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 114 - float16Comparisons(should FAIL: max != -inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -inf (operandRight)
+  found: 6.55e+04 (operandLeft)
+  expected: -inf (operandRight)
+  actual: 6.55e+04 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 115 - float16Comparisons(should FAIL: -max != -inf)
+  ---
+  type: QCOMPARE
+  message: Compared qfloat16s are not the same (fuzzy compare)
+  wanted: -inf (operandRight)
+  found: -6.55e+04 (operandLeft)
+  expected: -inf (operandRight)
+  actual: -6.55e+04 (operandLeft)
+  at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:171)
+  file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
+  line: 171
+  ...
+not ok 116 - compareFloatTests(1e0)
   ---
   type: QCOMPARE
   message: Compared floats are not the same (fuzzy compare)
@@ -805,11 +1146,11 @@ not ok 83 - compareFloatTests(1e0)
   found: 1 (t1)
   expected: 3 (t3)
   actual: 1 (t1)
-  at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:216)
+  at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:210)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
-  line: 216
+  line: 210
   ...
-not ok 84 - compareFloatTests(1e-7)
+not ok 117 - compareFloatTests(1e-7)
   ---
   type: QCOMPARE
   message: Compared floats are not the same (fuzzy compare)
@@ -817,11 +1158,11 @@ not ok 84 - compareFloatTests(1e-7)
   found: 1e-07 (t1)
   expected: 3e-07 (t3)
   actual: 1e-07 (t1)
-  at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:216)
+  at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:210)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
-  line: 216
+  line: 210
   ...
-not ok 85 - compareFloatTests(1e+7)
+not ok 118 - compareFloatTests(1e+7)
   ---
   type: QCOMPARE
   message: Compared floats are not the same (fuzzy compare)
@@ -829,12 +1170,12 @@ not ok 85 - compareFloatTests(1e+7)
   found: 1e+07 (t1)
   expected: 3e+07 (t3)
   actual: 1e+07 (t1)
-  at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:216)
+  at: tst_float::compareFloatTests() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:210)
   file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
-  line: 216
+  line: 210
   ...
-ok 86 - cleanupTestCase()
-1..86
-# tests 86
-# pass 18
-# fail 68
+ok 119 - cleanupTestCase()
+1..119
+# tests 119
+# pass 23
+# fail 96
diff --git a/tests/auto/testlib/selftests/expected_float.teamcity b/tests/auto/testlib/selftests/expected_float.teamcity
index eb99d3f6ea..af81296c42 100644
--- a/tests/auto/testlib/selftests/expected_float.teamcity
+++ b/tests/auto/testlib/selftests/expected_float.teamcity
@@ -215,19 +215,113 @@
 ##teamcity[testStarted name='floatComparisons(should FAIL: -max != -inf)' flowId='tst_float']
 ##teamcity[testFailed name='floatComparisons(should FAIL: -max != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (operandLeft) : -3.40282e+38|n Expected (operandRight): -inf' flowId='tst_float']
 ##teamcity[testFinished name='floatComparisons(should FAIL: -max != -inf)' flowId='tst_float']
-##teamcity[testStarted name='float16Comparisons(should SUCCEED 1)' flowId='tst_float']
-##teamcity[testFinished name='float16Comparisons(should SUCCEED 1)' flowId='tst_float']
 ##teamcity[testStarted name='float16Comparisons(should FAIL 1)' flowId='tst_float']
 ##teamcity[testFailed name='float16Comparisons(should FAIL 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 1|n Expected (operandRight): 3' flowId='tst_float']
 ##teamcity[testFinished name='float16Comparisons(should FAIL 1)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS 1)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS 1)' flowId='tst_float']
 ##teamcity[testStarted name='float16Comparisons(should FAIL 2)' flowId='tst_float']
 ##teamcity[testFailed name='float16Comparisons(should FAIL 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 0.0001|n Expected (operandRight): 0.0003' flowId='tst_float']
 ##teamcity[testFinished name='float16Comparisons(should FAIL 2)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS 2)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS 2)' flowId='tst_float']
 ##teamcity[testStarted name='float16Comparisons(should FAIL 3)' flowId='tst_float']
 ##teamcity[testFailed name='float16Comparisons(should FAIL 3)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 98|n Expected (operandRight): 99' flowId='tst_float']
 ##teamcity[testFinished name='float16Comparisons(should FAIL 3)' flowId='tst_float']
-##teamcity[testStarted name='float16Comparisons(should SUCCEED 2)' flowId='tst_float']
-##teamcity[testFinished name='float16Comparisons(should SUCCEED 2)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS 3)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS 3)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL 4)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL 4)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 5.93e-05|n Expected (operandRight): 5.87e-05' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL 4)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS 4)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS 4)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL 5)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL 5)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 5.94e+04|n Expected (operandRight): 5.88e+04' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL 5)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS: NaN == NaN)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS: NaN == NaN)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: NaN != 0)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: NaN != 0)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : nan|n Expected (operandRight): 0' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: NaN != 0)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: 0 != NaN)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: 0 != NaN)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 0|n Expected (operandRight): nan' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: 0 != NaN)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: NaN != 1)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: NaN != 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : nan|n Expected (operandRight): 1' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: NaN != 1)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: 1 != NaN)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: 1 != NaN)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 1|n Expected (operandRight): nan' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: 1 != NaN)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS: inf == inf)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS: inf == inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should PASS: -inf == -inf)' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should PASS: -inf == -inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: inf != -inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: inf != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : inf|n Expected (operandRight): -inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: inf != -inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -inf != inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -inf != inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -inf|n Expected (operandRight): inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -inf != inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: inf != nan)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: inf != nan)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : inf|n Expected (operandRight): nan' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: inf != nan)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: nan != inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: nan != inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : nan|n Expected (operandRight): inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: nan != inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -inf != nan)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -inf != nan)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -inf|n Expected (operandRight): nan' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -inf != nan)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: nan != -inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: nan != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : nan|n Expected (operandRight): -inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: nan != -inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: inf != 0)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: inf != 0)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : inf|n Expected (operandRight): 0' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: inf != 0)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: 0 != inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: 0 != inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 0|n Expected (operandRight): inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: 0 != inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -inf != 0)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -inf != 0)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -inf|n Expected (operandRight): 0' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -inf != 0)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: 0 != -inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: 0 != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 0|n Expected (operandRight): -inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: 0 != -inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: inf != 1)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: inf != 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : inf|n Expected (operandRight): 1' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: inf != 1)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: 1 != inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: 1 != inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 1|n Expected (operandRight): inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: 1 != inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -inf != 1)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -inf != 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -inf|n Expected (operandRight): 1' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -inf != 1)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: 1 != -inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: 1 != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 1|n Expected (operandRight): -inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: 1 != -inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: inf != max)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: inf != max)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : inf|n Expected (operandRight): 6.55e+04' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: inf != max)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: inf != -max)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: inf != -max)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : inf|n Expected (operandRight): -6.55e+04' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: inf != -max)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: max != inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: max != inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 6.55e+04|n Expected (operandRight): inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: max != inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -max != inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -max != inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -6.55e+04|n Expected (operandRight): inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -max != inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -inf != max)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -inf != max)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -inf|n Expected (operandRight): 6.55e+04' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -inf != max)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -inf != -max)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -inf != -max)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -inf|n Expected (operandRight): -6.55e+04' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -inf != -max)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: max != -inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: max != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 6.55e+04|n Expected (operandRight): -inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: max != -inf)' flowId='tst_float']
+##teamcity[testStarted name='float16Comparisons(should FAIL: -max != -inf)' flowId='tst_float']
+##teamcity[testFailed name='float16Comparisons(should FAIL: -max != -inf)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : -6.55e+04|n Expected (operandRight): -inf' flowId='tst_float']
+##teamcity[testFinished name='float16Comparisons(should FAIL: -max != -inf)' flowId='tst_float']
 ##teamcity[testStarted name='compareFloatTests(1e0)' flowId='tst_float']
 ##teamcity[testFailed name='compareFloatTests(1e0)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (t1): 1|n Expected (t3): 3' flowId='tst_float']
 ##teamcity[testFinished name='compareFloatTests(1e0)' flowId='tst_float']
diff --git a/tests/auto/testlib/selftests/expected_float.txt b/tests/auto/testlib/selftests/expected_float.txt
index 18a5bab628..d22a52a63d 100644
--- a/tests/auto/testlib/selftests/expected_float.txt
+++ b/tests/auto/testlib/selftests/expected_float.txt
@@ -263,20 +263,137 @@ FAIL!  : tst_float::floatComparisons(should FAIL: -max != -inf) Compared floats
    Actual   (operandLeft) : -3.40282e+38
    Expected (operandRight): -inf
    Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
-PASS   : tst_float::float16Comparisons(should SUCCEED 1)
 FAIL!  : tst_float::float16Comparisons(should FAIL 1) Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
    Expected (operandRight): 3
    Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS   : tst_float::float16Comparisons(should PASS 1)
 FAIL!  : tst_float::float16Comparisons(should FAIL 2) Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0.0001
    Expected (operandRight): 0.0003
    Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS   : tst_float::float16Comparisons(should PASS 2)
 FAIL!  : tst_float::float16Comparisons(should FAIL 3) Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 98
    Expected (operandRight): 99
    Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
-PASS   : tst_float::float16Comparisons(should SUCCEED 2)
+PASS   : tst_float::float16Comparisons(should PASS 3)
+FAIL!  : tst_float::float16Comparisons(should FAIL 4) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.93e-05
+   Expected (operandRight): 5.87e-05
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS   : tst_float::float16Comparisons(should PASS 4)
+FAIL!  : tst_float::float16Comparisons(should FAIL 5) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.94e+04
+   Expected (operandRight): 5.88e+04
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS   : tst_float::float16Comparisons(should PASS: NaN == NaN)
+FAIL!  : tst_float::float16Comparisons(should FAIL: NaN != 0) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 0
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: 0 != NaN) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): nan
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: NaN != 1) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 1
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: 1 != NaN) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): nan
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS   : tst_float::float16Comparisons(should PASS: inf == inf)
+PASS   : tst_float::float16Comparisons(should PASS: -inf == -inf)
+FAIL!  : tst_float::float16Comparisons(should FAIL: inf != -inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): -inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -inf != inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: inf != nan) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): nan
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: nan != inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -inf != nan) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): nan
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: nan != -inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): -inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: inf != 0) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 0
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: 0 != inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -inf != 0) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 0
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: 0 != -inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): -inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: inf != 1) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 1
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: 1 != inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -inf != 1) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 1
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: 1 != -inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): -inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: inf != max) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 6.55e+04
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: inf != -max) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): -6.55e+04
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: max != inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -max != inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -6.55e+04
+   Expected (operandRight): inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -inf != max) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 6.55e+04
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -inf != -max) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): -6.55e+04
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: max != -inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): -inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+FAIL!  : tst_float::float16Comparisons(should FAIL: -max != -inf) Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -6.55e+04
+   Expected (operandRight): -inf
+   Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
 FAIL!  : tst_float::compareFloatTests(1e0) Compared floats are not the same (fuzzy compare)
    Actual   (t1): 1
    Expected (t3): 3
@@ -290,5 +407,5 @@ FAIL!  : tst_float::compareFloatTests(1e+7) Compared floats are not the same (fu
    Expected (t3): 3e+07
    Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
 PASS   : tst_float::cleanupTestCase()
-Totals: 18 passed, 68 failed, 0 skipped, 0 blacklisted, 0ms
+Totals: 23 passed, 96 failed, 0 skipped, 0 blacklisted, 0ms
 ********* Finished testing of tst_float *********
diff --git a/tests/auto/testlib/selftests/expected_float.xml b/tests/auto/testlib/selftests/expected_float.xml
index b8e1a23616..247bce9577 100644
--- a/tests/auto/testlib/selftests/expected_float.xml
+++ b/tests/auto/testlib/selftests/expected_float.xml
@@ -430,21 +430,24 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="float16Comparisons">
-<Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[should SUCCEED 1]]></DataTag>
-</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
     <DataTag><![CDATA[should FAIL 1]]></DataTag>
     <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 1
    Expected (operandRight): 3]]></Description>
 </Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS 1]]></DataTag>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
     <DataTag><![CDATA[should FAIL 2]]></DataTag>
     <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 0.0001
    Expected (operandRight): 0.0003]]></Description>
 </Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS 2]]></DataTag>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
     <DataTag><![CDATA[should FAIL 3]]></DataTag>
     <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
@@ -452,7 +455,187 @@
    Expected (operandRight): 99]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[should SUCCEED 2]]></DataTag>
+    <DataTag><![CDATA[should PASS 3]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL 4]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.93e-05
+   Expected (operandRight): 5.87e-05]]></Description>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS 4]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL 5]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.94e+04
+   Expected (operandRight): 5.88e+04]]></Description>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS: NaN == NaN]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: NaN != 0]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 0]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 0 != NaN]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: NaN != 1]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 1]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 1 != NaN]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS: inf == inf]]></DataTag>
+</Incident>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[should PASS: -inf == -inf]]></DataTag>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != nan]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: nan != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != nan]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): nan]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: nan != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != 0]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 0]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 0 != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != 0]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 0]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 0 != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != 1]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 1]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 1 != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != 1]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 1]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: 1 != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: inf != -max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): -6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: max != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -max != inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -6.55e+04
+   Expected (operandRight): inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): 6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -inf != -max]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -inf
+   Expected (operandRight): -6.55e+04]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: max != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): -inf]]></Description>
+</Incident>
+<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+    <DataTag><![CDATA[should FAIL: -max != -inf]]></DataTag>
+    <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : -6.55e+04
+   Expected (operandRight): -inf]]></Description>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_float.xunitxml b/tests/auto/testlib/selftests/expected_float.xunitxml
index 9b2af9b616..602f9252a4 100644
--- a/tests/auto/testlib/selftests/expected_float.xunitxml
+++ b/tests/auto/testlib/selftests/expected_float.xunitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="68" tests="6" name="tst_float">
+<testsuite errors="0" failures="96" tests="6" name="tst_float">
   <properties>
     <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
     <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
@@ -206,6 +206,90 @@
     <failure tag="should FAIL 3" message="Compared qfloat16s are not the same (fuzzy compare)
    Actual   (operandLeft) : 98
    Expected (operandRight): 99" result="fail"/>
+    <failure tag="should FAIL 4" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.93e&#x002D;05
+   Expected (operandRight): 5.87e&#x002D;05" result="fail"/>
+    <failure tag="should FAIL 5" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 5.94e+04
+   Expected (operandRight): 5.88e+04" result="fail"/>
+    <failure tag="should FAIL: NaN != 0" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 0" result="fail"/>
+    <failure tag="should FAIL: 0 != NaN" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): nan" result="fail"/>
+    <failure tag="should FAIL: NaN != 1" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): 1" result="fail"/>
+    <failure tag="should FAIL: 1 != NaN" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): nan" result="fail"/>
+    <failure tag="should FAIL: inf != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): &#x002D;inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;inf != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;inf
+   Expected (operandRight): inf" result="fail"/>
+    <failure tag="should FAIL: inf != nan" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): nan" result="fail"/>
+    <failure tag="should FAIL: nan != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;inf != nan" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;inf
+   Expected (operandRight): nan" result="fail"/>
+    <failure tag="should FAIL: nan != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : nan
+   Expected (operandRight): &#x002D;inf" result="fail"/>
+    <failure tag="should FAIL: inf != 0" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 0" result="fail"/>
+    <failure tag="should FAIL: 0 != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;inf != 0" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;inf
+   Expected (operandRight): 0" result="fail"/>
+    <failure tag="should FAIL: 0 != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 0
+   Expected (operandRight): &#x002D;inf" result="fail"/>
+    <failure tag="should FAIL: inf != 1" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 1" result="fail"/>
+    <failure tag="should FAIL: 1 != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;inf != 1" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;inf
+   Expected (operandRight): 1" result="fail"/>
+    <failure tag="should FAIL: 1 != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 1
+   Expected (operandRight): &#x002D;inf" result="fail"/>
+    <failure tag="should FAIL: inf != max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): 6.55e+04" result="fail"/>
+    <failure tag="should FAIL: inf != &#x002D;max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : inf
+   Expected (operandRight): &#x002D;6.55e+04" result="fail"/>
+    <failure tag="should FAIL: max != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;max != inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;6.55e+04
+   Expected (operandRight): inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;inf != max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;inf
+   Expected (operandRight): 6.55e+04" result="fail"/>
+    <failure tag="should FAIL: &#x002D;inf != &#x002D;max" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;inf
+   Expected (operandRight): &#x002D;6.55e+04" result="fail"/>
+    <failure tag="should FAIL: max != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : 6.55e+04
+   Expected (operandRight): &#x002D;inf" result="fail"/>
+    <failure tag="should FAIL: &#x002D;max != &#x002D;inf" message="Compared qfloat16s are not the same (fuzzy compare)
+   Actual   (operandLeft) : &#x002D;6.55e+04
+   Expected (operandRight): &#x002D;inf" result="fail"/>
   </testcase>
   <testcase result="fail" name="compareFloatTests">
     <failure tag="1e0" message="Compared floats are not the same (fuzzy compare)
diff --git a/tests/auto/testlib/selftests/float/tst_float.cpp b/tests/auto/testlib/selftests/float/tst_float.cpp
index 621dd1ccd9..cefd8a57c4 100644
--- a/tests/auto/testlib/selftests/float/tst_float.cpp
+++ b/tests/auto/testlib/selftests/float/tst_float.cpp
@@ -175,28 +175,22 @@ void tst_float::float16Comparisons_data() const
 {
     QTest::addColumn<qfloat16>("operandLeft");
     QTest::addColumn<qfloat16>("operandRight");
+    qfloat16 zero(0), one(1);
 
-    QTest::newRow("should SUCCEED 1")
-        << qfloat16(0)
-        << qfloat16(0);
-
-    QTest::newRow("should FAIL 1")
-        << qfloat16(1.000)
-        << qfloat16(3.000);
-
-    QTest::newRow("should FAIL 2")
-        << qfloat16(1.000e-4f)
-        << qfloat16(3.000e-4f);
+    QTest::newRow("should FAIL 1") << one << qfloat16(3);
+    QTest::newRow("should PASS 1") << zero << zero;
+    QTest::newRow("should FAIL 2") << qfloat16(1e-4f) << qfloat16(3e-4f);
 
     // QCOMPARE for qfloat16s uses qFuzzyCompare()
+    QTest::newRow("should PASS 2") << qfloat16(1001) << qfloat16(1002);
+    QTest::newRow("should FAIL 3") << qfloat16(98) << qfloat16(99);
+    // ... which gets a bit unreliable near to the type's bounds
+    QTest::newRow("should PASS 3") << qfloat16(6e-5f) + qfloat16(6e-7f) << qfloat16(6e-5f) + qfloat16(11e-7f);
+    QTest::newRow("should FAIL 4") << qfloat16(6e-5f) - qfloat16(7e-7f) << qfloat16(6e-5f) - qfloat16(13e-7f);
+    QTest::newRow("should PASS 4") << qfloat16(6e4) + qfloat16(700) << qfloat16(6e4) + qfloat16(1200);
+    QTest::newRow("should FAIL 5") << qfloat16(6e4) - qfloat16(600) << qfloat16(6e4) - qfloat16(1200);
 
-    QTest::newRow("should FAIL 3")
-        << qfloat16(98)
-        << qfloat16(99);
-
-    QTest::newRow("should SUCCEED 2")
-        << qfloat16(1001)
-        << qfloat16(1002);
+    nonFinite_data(zero, one);
 }
 
 void tst_float::compareFloatTests() const