diff options
| author | Thiago Macieira <[email protected]> | 2025-02-07 09:15:30 -0800 |
|---|---|---|
| committer | Thiago Macieira <[email protected]> | 2025-02-14 14:02:01 -0800 |
| commit | 395d23fbb3f4a03d4d10d6ff2337db5abf3fdc5f (patch) | |
| tree | e9d337da20e00ac901522274c58281e9186361ac | |
| parent | b8b6382b02457963fa5d0e67e069dc92e6d6c9d9 (diff) | |
QTest::toString(): print FP with full precision and in hexfloat
It's very annoying to try and debug why the values are different when
QCOMPARE(_xx) says they are the same:
FAIL! : tst_QCborStreamReader::floatingPoint(QByteArray:2.^64-epsilon) The computed value is expected to be equal to the baseline, but is not
Computed (reader.toDouble()): 1.84467440737e+19
Baseline (expectedValue) : 1.84467440737e+19
Now:
Computed (reader.toDouble()): 1.844674407370955e+19 (0x1.fffffffffffffp+63)
Baseline (expectedValue) : 1.844674407370952e+19 (0x1.ffffffffffffp+63)
%a formatting is required by C11, which is required for C++17, which we
require. I've modified tst_selftests to normalize the representation of
floating point numbers on-the-fly, so we don't have to deal with
differences in how the different libc print floating point values[1].
This allows us to remove qtestcase.cpp's massageExponent() function,
if we want to in the future.
I've chosen to use std::regex instead of QRegularExpression so we don't
break tst_selftests in case we break QRE or our PCRE dependency. I've
also moved the floating point comparison that was in tst_cmptest to
tst_float, where all other floating point were.
Ideally we'd also print the NaN payload when not zeroes, but that's a
job for another day.
[ChangeLog][QtTest] QtTest now prints floating point values in
hexadecimal notation and has increased the precision for the decimal
format, so different values can be observed in the output when QCOMPARE
or QCOMPARE_xx fail.
[1] For example, whether 1 is 0x1p+0 or 0x8p-3. For me, the 0x1 prefix
is objectively more useful because the part after the dot matches the
mantissa bits in the variable and the exponent matches the stored
exponent (minus the bias).
Task-number: QTBUG-85779
Task-number: QTBUG-127280
Change-Id: Idc6cb070c750d2acbd26fffdc8defad7d7ae8733
Reviewed-by: Edward Welbourne <[email protected]>
18 files changed, 445 insertions, 446 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 93d604c62b6..07976a9e80f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -3101,28 +3101,33 @@ static void massageExponent(char *text) // Be consistent about display of infinities and NaNs (snprintf()'s varies, // notably on MinGW, despite POSIX documenting "[-]inf" or "[-]infinity" for %f, // %e and %g, uppercasing for their capital versions; similar for "nan"): -#define TO_STRING_FLOAT(TYPE, FORMAT) \ +static char *toStringFp(double t, int digits10) +{ + char *msg = new char[128]; + switch (qFpClassify(t)) { + case FP_INFINITE: + qstrncpy(msg, (t < 0 ? "-inf" : "inf"), 128); + break; + case FP_NAN: + qstrncpy(msg, "nan", 128); + break; + default: + std::snprintf(msg, 128, "%.*g", digits10, t); + massageExponent(msg); + std::snprintf(msg + strlen(msg), 128 - strlen(msg), " (%a)", t); + break; + } + return msg; +} + +#define TO_STRING_FLOAT(TYPE) \ template <> Q_TESTLIB_EXPORT char *QTest::toString<TYPE>(const TYPE &t) \ { \ - char *msg = new char[128]; \ - switch (qFpClassify(t)) { \ - case FP_INFINITE: \ - qstrncpy(msg, (t < 0 ? "-inf" : "inf"), 128); \ - break; \ - case FP_NAN: \ - qstrncpy(msg, "nan", 128); \ - break; \ - default: \ - std::snprintf(msg, 128, #FORMAT, double(t)); \ - massageExponent(msg); \ - break; \ - } \ - return msg; \ + return toStringFp(t, std::numeric_limits<TYPE>::digits10 + 1); \ } - -TO_STRING_FLOAT(qfloat16, %.3g) -TO_STRING_FLOAT(float, %g) -TO_STRING_FLOAT(double, %.12g) +TO_STRING_FLOAT(qfloat16) +TO_STRING_FLOAT(float) +TO_STRING_FLOAT(double) template <> Q_TESTLIB_EXPORT char *QTest::toString<char>(const char &t) { diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp index 1bd786ca04d..5dee0a8d4e9 100644 --- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp +++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp @@ -3325,6 +3325,9 @@ void tst_QCborValue::debugOutput() void tst_QCborValue::testlibFormatting_data() { + auto formattedDouble = [](double d) { + return QString::fromLatin1(std::unique_ptr<char[]>(QTest::toString(d)).get()); + }; QTest::addColumn<QCborValue>("v"); QTest::addColumn<QString>("expected"); @@ -3337,7 +3340,8 @@ void tst_QCborValue::testlibFormatting_data() QTest::newRow("simpletype") << QCborValue(QCborSimpleType(0)) << "QCborValue(QCborSimpleType(0))"; QTest::newRow("Integer:0") << QCborValue(0) << "QCborValue(Integer, 0)"; - QTest::newRow("Double:0") << QCborValue(0.) << "QCborValue(Double, 0)"; // must be integer! + QTest::newRow("Double:0") + << QCborValue(0.) << "QCborValue(Double, " + formattedDouble(0) + ')'; // must be integer! QTest::newRow("ByteArray") << QCborValue(raw("Hello\0World")) << "QCborValue(ByteArray, \"Hello\\x00World\")"; QTest::newRow("String") @@ -3360,11 +3364,11 @@ void tst_QCborValue::testlibFormatting_data() QTest::newRow("Map:Empty") << QCborValue(QCborMap()) << "QCborValue(Map, {})"; QTest::newRow("Array") << QCborValue(QCborArray{1, 2., nullptr}) - << "QCborValue(Array, [QCborValue(Integer, 1), QCborValue(Double, 2), QCborValue(nullptr)])"; + << "QCborValue(Array, [QCborValue(Integer, 1), QCborValue(Double, " + formattedDouble(2) + "), QCborValue(nullptr)])"; QTest::newRow("Map") << QCborValue(QCborMap{{1, 2.}, {nullptr, "Hello"}, {"World", QCborArray()}}) << "QCborValue(Map, {" - "QCborValue(Integer, 1): QCborValue(Double, 2), " + "QCborValue(Integer, 1): QCborValue(Double, " + formattedDouble(2) + "), " "QCborValue(nullptr): QCborValue(String, \"Hello\"), " "QCborValue(String, \"World\"): QCborValue(Array, [])" "})"; diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index 4d299c6f0f7..e10dd6da885 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -130,7 +130,6 @@ private slots: void compareQListIntToArray(); void compareQListIntToInitializerList_data(); void compareQListIntToInitializerList(); - void compareQListDouble(); void compareContainerToInitializerList(); #ifdef QT_GUI_LIB void compareQColor_data(); @@ -528,13 +527,6 @@ void tst_Cmptest::compareQListIntToInitializerList() #undef ARG } -void tst_Cmptest::compareQListDouble() -{ - QList<double> double1; double1 << 1.5 << 2 << 3; - QList<double> double2; double2 << 1 << 2 << 4; - QCOMPARE(double1, double2); -} - void tst_Cmptest::compareContainerToInitializerList() { // Protect ',' in the list diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml index 75c0c064285..ce6a1c0c76e 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.junitxml +++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="75" failures="52" errors="0" skipped="0" time="@TEST_DURATION@"> +<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="74" failures="51" errors="0" skipped="0" time="@TEST_DURATION@"> <properties> <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/> <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/> @@ -173,12 +173,6 @@ Expected (ARG({1, 2, 3})): 3]]> </failure> </testcase> - <testcase name="compareQListDouble" classname="tst_Cmptest" time="@TEST_DURATION@"> - <failure type="fail" message="Compared lists differ at index 0."> - <![CDATA[ Actual (double1): 1.5 - Expected (double2): 1]]> - </failure> - </testcase> <testcase name="compareContainerToInitializerList" classname="tst_Cmptest" time="@TEST_DURATION@"/> <testcase name="compareQColor(Qt::yellow vs "yellow")" classname="tst_Cmptest" time="@TEST_DURATION@"/> <testcase name="compareQColor(Qt::yellow vs Qt::green)" classname="tst_Cmptest" time="@TEST_DURATION@"> diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index 3e5438e6cf3..9919dde3241 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -279,14 +279,6 @@ </Incident> <Duration msecs="0"/> </TestFunction> - <TestFunction name="compareQListDouble"> - <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> - <Description><![CDATA[Compared lists differ at index 0. - Actual (double1): 1.5 - Expected (double2): 1]]></Description> - </Incident> - <Duration msecs="0"/> - </TestFunction> <TestFunction name="compareContainerToInitializerList"> <Incident type="pass" file="" line="0" /> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_cmptest.tap b/tests/auto/testlib/selftests/expected_cmptest.tap index 8fad22b99dd..77118713717 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.tap +++ b/tests/auto/testlib/selftests/expected_cmptest.tap @@ -411,21 +411,9 @@ not ok 38 - compareQListIntToInitializerList(value mismatch) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 39 - compareQListDouble() - --- - type: QCOMPARE - message: Compared lists differ at index 0. - wanted: 1 (double2) - found: 1.5 (double1) - expected: 1 (double2) - actual: 1.5 (double1) - at: tst_Cmptest::compareQListDouble() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:0) - file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp - line: 0 - ... -ok 40 - compareContainerToInitializerList() -ok 41 - compareQColor(Qt::yellow vs "yellow") -not ok 42 - compareQColor(Qt::yellow vs Qt::green) +ok 39 - compareContainerToInitializerList() +ok 40 - compareQColor(Qt::yellow vs "yellow") +not ok 41 - compareQColor(Qt::yellow vs Qt::green) --- type: QCOMPARE message: Compared values are not the same @@ -437,7 +425,7 @@ not ok 42 - compareQColor(Qt::yellow vs Qt::green) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 43 - compareQColor(0x88ff0000 vs 0xffff0000) +not ok 42 - compareQColor(0x88ff0000 vs 0xffff0000) --- type: QCOMPARE message: Compared values are not the same @@ -449,8 +437,8 @@ not ok 43 - compareQColor(0x88ff0000 vs 0xffff0000) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 44 - compareQPixmaps(both null) -not ok 45 - compareQPixmaps(one null) +ok 43 - compareQPixmaps(both null) +not ok 44 - compareQPixmaps(one null) --- type: QCOMPARE message: Compared QPixmaps differ. @@ -462,7 +450,7 @@ not ok 45 - compareQPixmaps(one null) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 46 - compareQPixmaps(other null) +not ok 45 - compareQPixmaps(other null) --- type: QCOMPARE message: Compared QPixmaps differ. @@ -474,8 +462,8 @@ not ok 46 - compareQPixmaps(other null) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 47 - compareQPixmaps(equal) -not ok 48 - compareQPixmaps(different size) +ok 46 - compareQPixmaps(equal) +not ok 47 - compareQPixmaps(different size) --- type: QCOMPARE message: Compared QPixmaps differ in size. @@ -487,14 +475,14 @@ not ok 48 - compareQPixmaps(different size) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 49 - compareQPixmaps(different pixels) +not ok 48 - compareQPixmaps(different pixels) --- # Compared values are not the same at: tst_Cmptest::compareQPixmaps() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:0) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 50 - compareQPixmaps(different dpr) +not ok 49 - compareQPixmaps(different dpr) --- type: QCOMPARE message: Compared QPixmaps differ in device pixel ratio. @@ -506,8 +494,8 @@ not ok 50 - compareQPixmaps(different dpr) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 51 - compareQImages(both null) -not ok 52 - compareQImages(one null) +ok 50 - compareQImages(both null) +not ok 51 - compareQImages(one null) --- type: QCOMPARE message: Compared QImages differ. @@ -519,7 +507,7 @@ not ok 52 - compareQImages(one null) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 53 - compareQImages(other null) +not ok 52 - compareQImages(other null) --- type: QCOMPARE message: Compared QImages differ. @@ -531,8 +519,8 @@ not ok 53 - compareQImages(other null) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 54 - compareQImages(equal) -not ok 55 - compareQImages(different size) +ok 53 - compareQImages(equal) +not ok 54 - compareQImages(different size) --- type: QCOMPARE message: Compared QImages differ in size. @@ -544,7 +532,7 @@ not ok 55 - compareQImages(different size) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 56 - compareQImages(different format) +not ok 55 - compareQImages(different format) --- type: QCOMPARE message: Compared QImages differ in format. @@ -556,14 +544,14 @@ not ok 56 - compareQImages(different format) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 57 - compareQImages(different pixels) +not ok 56 - compareQImages(different pixels) --- # Compared values are not the same at: tst_Cmptest::compareQImages() (qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp:0) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 58 - compareQImages(different dpr) +not ok 57 - compareQImages(different dpr) --- type: QCOMPARE message: Compared QImages differ in device pixel ratio. @@ -575,8 +563,8 @@ not ok 58 - compareQImages(different dpr) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 59 - compareQRegion(equal-empty) -not ok 60 - compareQRegion(1-empty) +ok 58 - compareQRegion(equal-empty) +not ok 59 - compareQRegion(1-empty) --- type: QCOMPARE message: Compared values are not the same @@ -588,8 +576,8 @@ not ok 60 - compareQRegion(1-empty) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 61 - compareQRegion(equal) -not ok 62 - compareQRegion(different lists) +ok 60 - compareQRegion(equal) +not ok 61 - compareQRegion(different lists) --- type: QCOMPARE message: Compared values are not the same @@ -601,7 +589,7 @@ not ok 62 - compareQRegion(different lists) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 63 - compareQVector2D() +not ok 62 - compareQVector2D() --- type: QCOMPARE message: Compared values are not the same @@ -613,7 +601,7 @@ not ok 63 - compareQVector2D() file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 64 - compareQVector3D() +not ok 63 - compareQVector3D() --- type: QCOMPARE message: Compared values are not the same @@ -625,7 +613,7 @@ not ok 64 - compareQVector3D() file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 65 - compareQVector4D() +not ok 64 - compareQVector4D() --- type: QCOMPARE message: Compared values are not the same @@ -637,7 +625,7 @@ not ok 65 - compareQVector4D() file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 66 - compareQPalettes(all roles are different) +not ok 65 - compareQPalettes(all roles are different) --- type: QCOMPARE message: Compared values are not the same @@ -649,7 +637,7 @@ not ok 66 - compareQPalettes(all roles are different) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 67 - compareQPalettes(one role is different) +not ok 66 - compareQPalettes(one role is different) --- type: QCOMPARE message: Compared values are not the same @@ -661,8 +649,8 @@ not ok 67 - compareQPalettes(one role is different) file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 68 - compareQPalettes(all roles are the same) -not ok 69 - tryCompare() +ok 67 - compareQPalettes(all roles are the same) +not ok 68 - tryCompare() --- type: QCOMPARE message: Compared values are not the same @@ -678,7 +666,7 @@ not ok 69 - tryCompare() - severity: info message: Should now time out and fail ... -not ok 70 - verify() +not ok 69 - verify() --- type: QVERIFY message: Verification failed @@ -690,7 +678,7 @@ not ok 70 - verify() file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 71 - verify2() +not ok 70 - verify2() --- type: QVERIFY message: 42 >= 2 (as expected, in fact) @@ -702,7 +690,7 @@ not ok 71 - verify2() file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -not ok 72 - tryVerify() +not ok 71 - tryVerify() --- type: QVERIFY message: Verification failed @@ -718,7 +706,7 @@ not ok 72 - tryVerify() - severity: info message: Should now time out and fail ... -not ok 73 - tryVerify2() +not ok 72 - tryVerify2() --- type: QVERIFY message: Should time out and fail @@ -730,9 +718,9 @@ not ok 73 - tryVerify2() file: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp line: 0 ... -ok 74 - verifyExplicitOperatorBool() -ok 75 - cleanupTestCase() -1..75 -# tests 75 +ok 73 - verifyExplicitOperatorBool() +ok 74 - cleanupTestCase() +1..74 +# tests 74 # pass 23 -# fail 52 +# fail 51 diff --git a/tests/auto/testlib/selftests/expected_cmptest.teamcity b/tests/auto/testlib/selftests/expected_cmptest.teamcity index 38cb1b4ca39..c48262e0376 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.teamcity +++ b/tests/auto/testlib/selftests/expected_cmptest.teamcity @@ -119,9 +119,6 @@ ##teamcity[testStarted name='compareQListIntToInitializerList(value mismatch)' flowId='tst_Cmptest'] ##teamcity[testFailed name='compareQListIntToInitializerList(value mismatch)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists differ at index 2.|n Actual (actual): 4|n Expected (ARG({1, 2, 3})): 3' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQListIntToInitializerList(value mismatch)' flowId='tst_Cmptest'] -##teamcity[testStarted name='compareQListDouble()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQListDouble()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists differ at index 0.|n Actual (double1): 1.5|n Expected (double2): 1' flowId='tst_Cmptest'] -##teamcity[testFinished name='compareQListDouble()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareContainerToInitializerList()' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareContainerToInitializerList()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQColor(Qt::yellow vs "yellow")' flowId='tst_Cmptest'] diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index b3e28551213..efb305654f4 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -152,10 +152,6 @@ FAIL! : tst_Cmptest::compareQListIntToInitializerList(value mismatch) Compared Actual (actual): 4 Expected (ARG({1, 2, 3})): 3 Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] -FAIL! : tst_Cmptest::compareQListDouble() Compared lists differ at index 0. - Actual (double1): 1.5 - Expected (double2): 1 - Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareContainerToInitializerList() PASS : tst_Cmptest::compareQColor(Qt::yellow vs "yellow") FAIL! : tst_Cmptest::compareQColor(Qt::yellow vs Qt::green) Compared values are not the same @@ -257,5 +253,5 @@ FAIL! : tst_Cmptest::tryVerify2() '!c' returned FALSE. (Should time out and fai Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::verifyExplicitOperatorBool() PASS : tst_Cmptest::cleanupTestCase() -Totals: 23 passed, 52 failed, 0 skipped, 0 blacklisted, 0ms +Totals: 23 passed, 51 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Cmptest ********* diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index 272211370e5..f6ed03b0e9f 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -281,14 +281,6 @@ </Incident> <Duration msecs="0"/> </TestFunction> - <TestFunction name="compareQListDouble"> - <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> - <Description><![CDATA[Compared lists differ at index 0. - Actual (double1): 1.5 - Expected (double2): 1]]></Description> - </Incident> - <Duration msecs="0"/> - </TestFunction> <TestFunction name="compareContainerToInitializerList"> <Incident type="pass" file="" line="0" /> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.junitxml b/tests/auto/testlib/selftests/expected_extendedcompare.junitxml index b840773852f..1751b069f4e 100644 --- a/tests/auto/testlib/selftests/expected_extendedcompare.junitxml +++ b/tests/auto/testlib/selftests/expected_extendedcompare.junitxml @@ -72,126 +72,126 @@ <testcase name="compareFloats(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(EQ:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 1 - Baseline (rhs): 1.1]]> + <![CDATA[ Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]> </failure> </testcase> <testcase name="compareFloats(EQ:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 1.1 - Baseline (rhs): 1]]> + <![CDATA[ Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]> </failure> </testcase> <testcase name="compareFloats(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be different from the baseline, but is not"> - <![CDATA[ Computed (lhs): 1 - Baseline (rhs): 1]]> + <![CDATA[ Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]> </failure> </testcase> <testcase name="compareFloats(NE:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(NE:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be less than the baseline, but is not"> - <![CDATA[ Computed (lhs): 1 - Baseline (rhs): 1]]> + <![CDATA[ Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]> </failure> </testcase> <testcase name="compareFloats(LT:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(LT:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be less than the baseline, but is not"> - <![CDATA[ Computed (lhs): 1.1 - Baseline (rhs): 1]]> + <![CDATA[ Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]> </failure> </testcase> <testcase name="compareFloats(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(LE:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(LE:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 1.1 - Baseline (rhs): 1]]> + <![CDATA[ Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]> </failure> </testcase> <testcase name="compareFloats(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not"> - <![CDATA[ Computed (lhs): 1 - Baseline (rhs): 1]]> + <![CDATA[ Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]> </failure> </testcase> <testcase name="compareFloats(GT:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not"> - <![CDATA[ Computed (lhs): 1 - Baseline (rhs): 1.1]]> + <![CDATA[ Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]> </failure> </testcase> <testcase name="compareFloats(GT:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareFloats(GE:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 1 - Baseline (rhs): 1.1]]> + <![CDATA[ Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]> </failure> </testcase> <testcase name="compareFloats(GE:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(EQ:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 0 - Baseline (rhs): 0.1]]> + <![CDATA[ Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]> </failure> </testcase> <testcase name="compareDoubles(EQ:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 0.1 - Baseline (rhs): 0]]> + <![CDATA[ Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]> </failure> </testcase> <testcase name="compareDoubles(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be different from the baseline, but is not"> - <![CDATA[ Computed (lhs): 0 - Baseline (rhs): 0]]> + <![CDATA[ Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]> </failure> </testcase> <testcase name="compareDoubles(NE:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(NE:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be less than the baseline, but is not"> - <![CDATA[ Computed (lhs): 0 - Baseline (rhs): 0]]> + <![CDATA[ Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]> </failure> </testcase> <testcase name="compareDoubles(LT:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(LT:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be less than the baseline, but is not"> - <![CDATA[ Computed (lhs): 0.1 - Baseline (rhs): 0]]> + <![CDATA[ Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]> </failure> </testcase> <testcase name="compareDoubles(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(LE:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(LE:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 0.1 - Baseline (rhs): 0]]> + <![CDATA[ Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]> </failure> </testcase> <testcase name="compareDoubles(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not"> - <![CDATA[ Computed (lhs): 0 - Baseline (rhs): 0]]> + <![CDATA[ Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]> </failure> </testcase> <testcase name="compareDoubles(GT:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not"> - <![CDATA[ Computed (lhs): 0 - Baseline (rhs): 0.1]]> + <![CDATA[ Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]> </failure> </testcase> <testcase name="compareDoubles(GT:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> <testcase name="compareDoubles(GE:left < right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"> <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not"> - <![CDATA[ Computed (lhs): 0 - Baseline (rhs): 0.1]]> + <![CDATA[ Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]> </failure> </testcase> <testcase name="compareDoubles(GE:left > right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/> diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.lightxml b/tests/auto/testlib/selftests/expected_extendedcompare.lightxml index fd6e4869394..d8cf57ca066 100644 --- a/tests/auto/testlib/selftests/expected_extendedcompare.lightxml +++ b/tests/auto/testlib/selftests/expected_extendedcompare.lightxml @@ -98,20 +98,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[NE:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be different from the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[NE:left < right]]></DataTag> @@ -122,8 +122,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LT:left < right]]></DataTag> @@ -131,8 +131,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LE:left == right]]></DataTag> @@ -143,20 +143,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LE:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GT:left > right]]></DataTag> @@ -167,8 +167,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GE:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GE:left > right]]></DataTag> @@ -182,20 +182,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[NE:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be different from the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[NE:left < right]]></DataTag> @@ -206,8 +206,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LT:left < right]]></DataTag> @@ -215,8 +215,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LE:left == right]]></DataTag> @@ -227,20 +227,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LE:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GT:left > right]]></DataTag> @@ -251,8 +251,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GE:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GE:left > right]]></DataTag> diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.tap b/tests/auto/testlib/selftests/expected_extendedcompare.tap index 25d30c3e087..d650ce60043 100644 --- a/tests/auto/testlib/selftests/expected_extendedcompare.tap +++ b/tests/auto/testlib/selftests/expected_extendedcompare.tap @@ -123,10 +123,10 @@ not ok 21 - compareFloats(EQ:left < right) --- type: QCOMPARE_EQ message: The computed value is expected to be equal to the baseline, but is not - wanted: == 1.1 (rhs) - found: 1 (lhs) - expected: == 1.1 (rhs) - actual: 1 (lhs) + wanted: == 1.1 (0x1.19999ap+0) (rhs) + found: 1 (0x1p+0) (lhs) + expected: == 1.1 (0x1.19999ap+0) (rhs) + actual: 1 (0x1p+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -135,10 +135,10 @@ not ok 22 - compareFloats(EQ:left > right) --- type: QCOMPARE_EQ message: The computed value is expected to be equal to the baseline, but is not - wanted: == 1 (rhs) - found: 1.1 (lhs) - expected: == 1 (rhs) - actual: 1.1 (lhs) + wanted: == 1 (0x1p+0) (rhs) + found: 1.1 (0x1.19999ap+0) (lhs) + expected: == 1 (0x1p+0) (rhs) + actual: 1.1 (0x1.19999ap+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -147,10 +147,10 @@ not ok 23 - compareFloats(NE:left == right) --- type: QCOMPARE_NE message: The computed value is expected to be different from the baseline, but is not - wanted: != 1 (rhs) - found: 1 (lhs) - expected: != 1 (rhs) - actual: 1 (lhs) + wanted: != 1 (0x1p+0) (rhs) + found: 1 (0x1p+0) (lhs) + expected: != 1 (0x1p+0) (rhs) + actual: 1 (0x1p+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -161,10 +161,10 @@ not ok 26 - compareFloats(LT:left == right) --- type: QCOMPARE_LT message: The computed value is expected to be less than the baseline, but is not - wanted: < 1 (rhs) - found: 1 (lhs) - expected: < 1 (rhs) - actual: 1 (lhs) + wanted: < 1 (0x1p+0) (rhs) + found: 1 (0x1p+0) (lhs) + expected: < 1 (0x1p+0) (rhs) + actual: 1 (0x1p+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -174,10 +174,10 @@ not ok 28 - compareFloats(LT:left > right) --- type: QCOMPARE_LT message: The computed value is expected to be less than the baseline, but is not - wanted: < 1 (rhs) - found: 1.1 (lhs) - expected: < 1 (rhs) - actual: 1.1 (lhs) + wanted: < 1 (0x1p+0) (rhs) + found: 1.1 (0x1.19999ap+0) (lhs) + expected: < 1 (0x1p+0) (rhs) + actual: 1.1 (0x1.19999ap+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -188,10 +188,10 @@ not ok 31 - compareFloats(LE:left > right) --- type: QCOMPARE_LE message: The computed value is expected to be less than or equal to the baseline, but is not - wanted: <= 1 (rhs) - found: 1.1 (lhs) - expected: <= 1 (rhs) - actual: 1.1 (lhs) + wanted: <= 1 (0x1p+0) (rhs) + found: 1.1 (0x1.19999ap+0) (lhs) + expected: <= 1 (0x1p+0) (rhs) + actual: 1.1 (0x1.19999ap+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -200,10 +200,10 @@ not ok 32 - compareFloats(GT:left == right) --- type: QCOMPARE_GT message: The computed value is expected to be greater than the baseline, but is not - wanted: > 1 (rhs) - found: 1 (lhs) - expected: > 1 (rhs) - actual: 1 (lhs) + wanted: > 1 (0x1p+0) (rhs) + found: 1 (0x1p+0) (lhs) + expected: > 1 (0x1p+0) (rhs) + actual: 1 (0x1p+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -212,10 +212,10 @@ not ok 33 - compareFloats(GT:left < right) --- type: QCOMPARE_GT message: The computed value is expected to be greater than the baseline, but is not - wanted: > 1.1 (rhs) - found: 1 (lhs) - expected: > 1.1 (rhs) - actual: 1 (lhs) + wanted: > 1.1 (0x1.19999ap+0) (rhs) + found: 1 (0x1p+0) (lhs) + expected: > 1.1 (0x1.19999ap+0) (rhs) + actual: 1 (0x1p+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -226,10 +226,10 @@ not ok 36 - compareFloats(GE:left < right) --- type: QCOMPARE_GE message: The computed value is expected to be greater than or equal to the baseline, but is not - wanted: >= 1.1 (rhs) - found: 1 (lhs) - expected: >= 1.1 (rhs) - actual: 1 (lhs) + wanted: >= 1.1 (0x1.19999ap+0) (rhs) + found: 1 (0x1p+0) (lhs) + expected: >= 1.1 (0x1.19999ap+0) (rhs) + actual: 1 (0x1p+0) (lhs) at: tst_ExtendedCompare::compareFloats() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -240,10 +240,10 @@ not ok 39 - compareDoubles(EQ:left < right) --- type: QCOMPARE_EQ message: The computed value is expected to be equal to the baseline, but is not - wanted: == 0.1 (rhs) - found: 0 (lhs) - expected: == 0.1 (rhs) - actual: 0 (lhs) + wanted: == 0.1 (0x1.999999999999ap-4) (rhs) + found: 0 (0x0p+0) (lhs) + expected: == 0.1 (0x1.999999999999ap-4) (rhs) + actual: 0 (0x0p+0) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -252,10 +252,10 @@ not ok 40 - compareDoubles(EQ:left > right) --- type: QCOMPARE_EQ message: The computed value is expected to be equal to the baseline, but is not - wanted: == 0 (rhs) - found: 0.1 (lhs) - expected: == 0 (rhs) - actual: 0.1 (lhs) + wanted: == 0 (0x0p+0) (rhs) + found: 0.1 (0x1.999999999999ap-4) (lhs) + expected: == 0 (0x0p+0) (rhs) + actual: 0.1 (0x1.999999999999ap-4) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -264,10 +264,10 @@ not ok 41 - compareDoubles(NE:left == right) --- type: QCOMPARE_NE message: The computed value is expected to be different from the baseline, but is not - wanted: != 0 (rhs) - found: 0 (lhs) - expected: != 0 (rhs) - actual: 0 (lhs) + wanted: != 0 (0x0p+0) (rhs) + found: 0 (0x0p+0) (lhs) + expected: != 0 (0x0p+0) (rhs) + actual: 0 (0x0p+0) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -278,10 +278,10 @@ not ok 44 - compareDoubles(LT:left == right) --- type: QCOMPARE_LT message: The computed value is expected to be less than the baseline, but is not - wanted: < 0 (rhs) - found: 0 (lhs) - expected: < 0 (rhs) - actual: 0 (lhs) + wanted: < 0 (0x0p+0) (rhs) + found: 0 (0x0p+0) (lhs) + expected: < 0 (0x0p+0) (rhs) + actual: 0 (0x0p+0) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -291,10 +291,10 @@ not ok 46 - compareDoubles(LT:left > right) --- type: QCOMPARE_LT message: The computed value is expected to be less than the baseline, but is not - wanted: < 0 (rhs) - found: 0.1 (lhs) - expected: < 0 (rhs) - actual: 0.1 (lhs) + wanted: < 0 (0x0p+0) (rhs) + found: 0.1 (0x1.999999999999ap-4) (lhs) + expected: < 0 (0x0p+0) (rhs) + actual: 0.1 (0x1.999999999999ap-4) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -305,10 +305,10 @@ not ok 49 - compareDoubles(LE:left > right) --- type: QCOMPARE_LE message: The computed value is expected to be less than or equal to the baseline, but is not - wanted: <= 0 (rhs) - found: 0.1 (lhs) - expected: <= 0 (rhs) - actual: 0.1 (lhs) + wanted: <= 0 (0x0p+0) (rhs) + found: 0.1 (0x1.999999999999ap-4) (lhs) + expected: <= 0 (0x0p+0) (rhs) + actual: 0.1 (0x1.999999999999ap-4) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -317,10 +317,10 @@ not ok 50 - compareDoubles(GT:left == right) --- type: QCOMPARE_GT message: The computed value is expected to be greater than the baseline, but is not - wanted: > 0 (rhs) - found: 0 (lhs) - expected: > 0 (rhs) - actual: 0 (lhs) + wanted: > 0 (0x0p+0) (rhs) + found: 0 (0x0p+0) (lhs) + expected: > 0 (0x0p+0) (rhs) + actual: 0 (0x0p+0) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -329,10 +329,10 @@ not ok 51 - compareDoubles(GT:left < right) --- type: QCOMPARE_GT message: The computed value is expected to be greater than the baseline, but is not - wanted: > 0.1 (rhs) - found: 0 (lhs) - expected: > 0.1 (rhs) - actual: 0 (lhs) + wanted: > 0.1 (0x1.999999999999ap-4) (rhs) + found: 0 (0x0p+0) (lhs) + expected: > 0.1 (0x1.999999999999ap-4) (rhs) + actual: 0 (0x0p+0) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 @@ -343,10 +343,10 @@ not ok 54 - compareDoubles(GE:left < right) --- type: QCOMPARE_GE message: The computed value is expected to be greater than or equal to the baseline, but is not - wanted: >= 0.1 (rhs) - found: 0 (lhs) - expected: >= 0.1 (rhs) - actual: 0 (lhs) + wanted: >= 0.1 (0x1.999999999999ap-4) (rhs) + found: 0 (0x0p+0) (lhs) + expected: >= 0.1 (0x1.999999999999ap-4) (rhs) + actual: 0 (0x0p+0) (lhs) at: tst_ExtendedCompare::compareDoubles() (qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp:0) file: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp line: 0 diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.teamcity b/tests/auto/testlib/selftests/expected_extendedcompare.teamcity index 4c765561380..0278b5bbb18 100644 --- a/tests/auto/testlib/selftests/expected_extendedcompare.teamcity +++ b/tests/auto/testlib/selftests/expected_extendedcompare.teamcity @@ -49,90 +49,90 @@ ##teamcity[testStarted name='compareFloats(EQ:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(EQ:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(EQ:left < right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1.1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1 (0x1p+0)|n Baseline (rhs): 1.1 (0x1.19999ap+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(EQ:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(EQ:left > right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1.1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1.1 (0x1.19999ap+0)|n Baseline (rhs): 1 (0x1p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(EQ:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(NE:left == right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 1 (0x1p+0)|n Baseline (rhs): 1 (0x1p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(NE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(NE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(NE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(NE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(NE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(LT:left == right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1 (0x1p+0)|n Baseline (rhs): 1 (0x1p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(LT:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(LT:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(LT:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(LT:left > right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1.1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1.1 (0x1.19999ap+0)|n Baseline (rhs): 1 (0x1p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(LT:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(LE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(LE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(LE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(LE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(LE:left > right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 1.1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 1.1 (0x1.19999ap+0)|n Baseline (rhs): 1 (0x1p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(LE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(GT:left == right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1 (0x1p+0)|n Baseline (rhs): 1 (0x1p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(GT:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(GT:left < right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1.1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1 (0x1p+0)|n Baseline (rhs): 1.1 (0x1.19999ap+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(GT:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(GT:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(GT:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(GE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(GE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(GE:left < right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareFloats(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1.1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareFloats(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 1 (0x1p+0)|n Baseline (rhs): 1.1 (0x1.19999ap+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(GE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareFloats(GE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareFloats(GE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(EQ:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(EQ:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(EQ:left < right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0.1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0 (0x0p+0)|n Baseline (rhs): 0.1 (0x1.999999999999ap-4)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(EQ:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(EQ:left > right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0.1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0.1 (0x1.999999999999ap-4)|n Baseline (rhs): 0 (0x0p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(EQ:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(NE:left == right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 0 (0x0p+0)|n Baseline (rhs): 0 (0x0p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(NE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(NE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(NE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(NE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(NE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(LT:left == right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0 (0x0p+0)|n Baseline (rhs): 0 (0x0p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(LT:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(LT:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(LT:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(LT:left > right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0.1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0.1 (0x1.999999999999ap-4)|n Baseline (rhs): 0 (0x0p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(LT:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(LE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(LE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(LE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(LE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(LE:left > right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 0.1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 0.1 (0x1.999999999999ap-4)|n Baseline (rhs): 0 (0x0p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(LE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(GT:left == right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0 (0x0p+0)|n Baseline (rhs): 0 (0x0p+0)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(GT:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(GT:left < right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0.1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0 (0x0p+0)|n Baseline (rhs): 0.1 (0x1.999999999999ap-4)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(GT:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(GT:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(GT:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(GE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(GE:left == right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(GE:left < right)' flowId='tst_ExtendedCompare'] -##teamcity[testFailed name='compareDoubles(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0.1' flowId='tst_ExtendedCompare'] +##teamcity[testFailed name='compareDoubles(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 0 (0x0p+0)|n Baseline (rhs): 0.1 (0x1.999999999999ap-4)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(GE:left < right)' flowId='tst_ExtendedCompare'] ##teamcity[testStarted name='compareDoubles(GE:left > right)' flowId='tst_ExtendedCompare'] ##teamcity[testFinished name='compareDoubles(GE:left > right)' flowId='tst_ExtendedCompare'] diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.txt b/tests/auto/testlib/selftests/expected_extendedcompare.txt index 08b6b6deb4d..260d28635c7 100644 --- a/tests/auto/testlib/selftests/expected_extendedcompare.txt +++ b/tests/auto/testlib/selftests/expected_extendedcompare.txt @@ -48,92 +48,92 @@ FAIL! : tst_ExtendedCompare::compareInts(GE:left < right) The computed value is PASS : tst_ExtendedCompare::compareInts(GE:left > right) PASS : tst_ExtendedCompare::compareFloats(EQ:left == right) FAIL! : tst_ExtendedCompare::compareFloats(EQ:left < right) The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1 + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareFloats(EQ:left > right) The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1 + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareFloats(NE:left == right) The computed value is expected to be different from the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1 + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareFloats(NE:left < right) PASS : tst_ExtendedCompare::compareFloats(NE:left > right) FAIL! : tst_ExtendedCompare::compareFloats(LT:left == right) The computed value is expected to be less than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1 + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareFloats(LT:left < right) FAIL! : tst_ExtendedCompare::compareFloats(LT:left > right) The computed value is expected to be less than the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1 + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareFloats(LE:left == right) PASS : tst_ExtendedCompare::compareFloats(LE:left < right) FAIL! : tst_ExtendedCompare::compareFloats(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1 + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareFloats(GT:left == right) The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1 + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareFloats(GT:left < right) The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1 + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareFloats(GT:left > right) PASS : tst_ExtendedCompare::compareFloats(GE:left == right) FAIL! : tst_ExtendedCompare::compareFloats(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1 + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareFloats(GE:left > right) PASS : tst_ExtendedCompare::compareDoubles(EQ:left == right) FAIL! : tst_ExtendedCompare::compareDoubles(EQ:left < right) The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1 + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareDoubles(EQ:left > right) The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0 + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareDoubles(NE:left == right) The computed value is expected to be different from the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0 + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareDoubles(NE:left < right) PASS : tst_ExtendedCompare::compareDoubles(NE:left > right) FAIL! : tst_ExtendedCompare::compareDoubles(LT:left == right) The computed value is expected to be less than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0 + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareDoubles(LT:left < right) FAIL! : tst_ExtendedCompare::compareDoubles(LT:left > right) The computed value is expected to be less than the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0 + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareDoubles(LE:left == right) PASS : tst_ExtendedCompare::compareDoubles(LE:left < right) FAIL! : tst_ExtendedCompare::compareDoubles(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0 + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareDoubles(GT:left == right) The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0 + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] FAIL! : tst_ExtendedCompare::compareDoubles(GT:left < right) The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1 + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareDoubles(GT:left > right) PASS : tst_ExtendedCompare::compareDoubles(GE:left == right) FAIL! : tst_ExtendedCompare::compareDoubles(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1 + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4) Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)] PASS : tst_ExtendedCompare::compareDoubles(GE:left > right) PASS : tst_ExtendedCompare::comparePointers(EQ:left == right) diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.xml b/tests/auto/testlib/selftests/expected_extendedcompare.xml index ab55eebf890..2fb0c465583 100644 --- a/tests/auto/testlib/selftests/expected_extendedcompare.xml +++ b/tests/auto/testlib/selftests/expected_extendedcompare.xml @@ -100,20 +100,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[NE:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be different from the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[NE:left < right]]></DataTag> @@ -124,8 +124,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LT:left < right]]></DataTag> @@ -133,8 +133,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LE:left == right]]></DataTag> @@ -145,20 +145,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LE:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not - Computed (lhs): 1.1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1.1 (0x1.19999ap+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1 (0x1p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GT:left > right]]></DataTag> @@ -169,8 +169,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GE:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not - Computed (lhs): 1 - Baseline (rhs): 1.1]]></Description> + Computed (lhs): 1 (0x1p+0) + Baseline (rhs): 1.1 (0x1.19999ap+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GE:left > right]]></DataTag> @@ -184,20 +184,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[EQ:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[NE:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be different from the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[NE:left < right]]></DataTag> @@ -208,8 +208,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LT:left < right]]></DataTag> @@ -217,8 +217,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LT:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[LE:left == right]]></DataTag> @@ -229,20 +229,20 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[LE:left > right]]></DataTag> <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not - Computed (lhs): 0.1 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0.1 (0x1.999999999999ap-4) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left == right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0 (0x0p+0)]]></Description> </Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GT:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GT:left > right]]></DataTag> @@ -253,8 +253,8 @@ <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0"> <DataTag><![CDATA[GE:left < right]]></DataTag> <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not - Computed (lhs): 0 - Baseline (rhs): 0.1]]></Description> + Computed (lhs): 0 (0x0p+0) + Baseline (rhs): 0.1 (0x1.999999999999ap-4)]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[GE:left > right]]></DataTag> diff --git a/tests/auto/testlib/selftests/expected_float.txt b/tests/auto/testlib/selftests/expected_float.txt index 3ec7eafae57..b00a07ec2df 100644 --- a/tests/auto/testlib/selftests/expected_float.txt +++ b/tests/auto/testlib/selftests/expected_float.txt @@ -2,44 +2,44 @@ Config: Using QtTest library PASS : tst_float::initTestCase() FAIL! : tst_float::doubleComparisons(should FAIL 1) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1 - Expected (operandRight): 3 + Actual (operandLeft) : 1 (0x1p+0) + Expected (operandRight): 3 (0x1.8p+1) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::doubleComparisons(should PASS 1) FAIL! : tst_float::doubleComparisons(should FAIL 2) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1e-07 - Expected (operandRight): 3e-07 + Actual (operandLeft) : 1e-07 (0x1.ad7f29abcaf48p-24) + Expected (operandRight): 3e-07 (0x1.421f5f40d8376p-22) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::doubleComparisons(should PASS 2) FAIL! : tst_float::doubleComparisons(should FAIL 3) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 999999999999 - Expected (operandRight): 999999999998 + Actual (operandLeft) : 999999999999 (0x1.d1a94a1ffep+39) + Expected (operandRight): 999999999998 (0x1.d1a94a1ffcp+39) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::doubleComparisons(should PASS 3) FAIL! : tst_float::doubleComparisons(should FAIL 4) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1e-12 - Expected (operandRight): 9.99999999999e-13 + Actual (operandLeft) : 1.000000000001e-12 (0x1.19799812dfd69p-40) + Expected (operandRight): 9.999999999989999e-13 (0x1.19799812dd6b9p-40) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::doubleComparisons(should PASS 4) FAIL! : tst_float::doubleComparisons(should FAIL 5) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 9.99999999999e+306 - Expected (operandRight): 9.99999999997e+306 + Actual (operandLeft) : 9.999999999989999e+306 (0x1.c7b1f3cac54e2p+1019) + Expected (operandRight): 9.99999999997e+306 (0x1.c7b1f3cac1641p+1019) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::doubleComparisons(should PASS: NaN == NaN) FAIL! : tst_float::doubleComparisons(should FAIL: NaN != 0) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : nan - Expected (operandRight): 0 + Expected (operandRight): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: 0 != NaN) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 0 + Actual (operandLeft) : 0 (0x0p+0) Expected (operandRight): nan Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: NaN != 1) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : nan - Expected (operandRight): 1 + Expected (operandRight): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: 1 != NaN) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): nan Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::doubleComparisons(should PASS: inf == inf) @@ -70,107 +70,107 @@ FAIL! : tst_float::doubleComparisons(should FAIL: nan != -inf) Compared doubles Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: inf != 0) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): 0 + Expected (operandRight): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: 0 != inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 0 + Actual (operandLeft) : 0 (0x0p+0) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: -inf != 0) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): 0 + Expected (operandRight): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: 0 != -inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 0 + Actual (operandLeft) : 0 (0x0p+0) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: inf != 1) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): 1 + Expected (operandRight): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: 1 != inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: -inf != 1) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): 1 + Expected (operandRight): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: 1 != -inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: inf != max) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): 1.79769313486e+308 + Expected (operandRight): 1.797693134862316e+308 (0x1.fffffffffffffp+1023) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: inf != -max) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): -1.79769313486e+308 + Expected (operandRight): -1.797693134862316e+308 (-0x1.fffffffffffffp+1023) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: max != inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1.79769313486e+308 + Actual (operandLeft) : 1.797693134862316e+308 (0x1.fffffffffffffp+1023) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: -max != inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : -1.79769313486e+308 + Actual (operandLeft) : -1.797693134862316e+308 (-0x1.fffffffffffffp+1023) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: -inf != max) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): 1.79769313486e+308 + Expected (operandRight): 1.797693134862316e+308 (0x1.fffffffffffffp+1023) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: -inf != -max) Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): -1.79769313486e+308 + Expected (operandRight): -1.797693134862316e+308 (-0x1.fffffffffffffp+1023) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: max != -inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 1.79769313486e+308 + Actual (operandLeft) : 1.797693134862316e+308 (0x1.fffffffffffffp+1023) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::doubleComparisons(should FAIL: -max != -inf) Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : -1.79769313486e+308 + Actual (operandLeft) : -1.797693134862316e+308 (-0x1.fffffffffffffp+1023) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL 1) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1 - Expected (operandRight): 3 + Actual (operandLeft) : 1 (0x1p+0) + Expected (operandRight): 3 (0x1.8p+1) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should PASS 1) FAIL! : tst_float::floatComparisons(should FAIL 2) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1e-05 - Expected (operandRight): 3e-05 + Actual (operandLeft) : 1e-05 (0x1.4f8b58p-17) + Expected (operandRight): 3e-05 (0x1.f75104p-16) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should PASS 2) FAIL! : tst_float::floatComparisons(should FAIL 3) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 99999 - Expected (operandRight): 99998 + Actual (operandLeft) : 99999 (0x1.869fp+16) + Expected (operandRight): 99998 (0x1.869ep+16) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should PASS 3) FAIL! : tst_float::floatComparisons(should FAIL 4) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1.00001e-05 - Expected (operandRight): 9.9999e-06 + Actual (operandLeft) : 1.00001e-05 (0x1.4f8c34p-17) + Expected (operandRight): 9.9999e-06 (0x1.4f8a7cp-17) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should PASS 4) FAIL! : tst_float::floatComparisons(should FAIL 5) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 9.9999e+37 - Expected (operandRight): 9.9997e+37 + Actual (operandLeft) : 9.999899e+37 (0x1.2cec6cp+126) + Expected (operandRight): 9.9997e+37 (0x1.2ceae2p+126) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should PASS: NaN == NaN) FAIL! : tst_float::floatComparisons(should FAIL: NaN != 0) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : nan - Expected (operandRight): 0 + Expected (operandRight): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: 0 != NaN) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 0 + Actual (operandLeft) : 0 (0x0p+0) Expected (operandRight): nan Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: NaN != 1) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : nan - Expected (operandRight): 1 + Expected (operandRight): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: 1 != NaN) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): nan Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should PASS: inf == inf) @@ -201,107 +201,107 @@ FAIL! : tst_float::floatComparisons(should FAIL: nan != -inf) Compared floats a Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: inf != 0) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): 0 + Expected (operandRight): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: 0 != inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 0 + Actual (operandLeft) : 0 (0x0p+0) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: -inf != 0) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): 0 + Expected (operandRight): 0 (0x0p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: 0 != -inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 0 + Actual (operandLeft) : 0 (0x0p+0) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: inf != 1) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): 1 + Expected (operandRight): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: 1 != inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: -inf != 1) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): 1 + Expected (operandRight): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: 1 != -inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: inf != max) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): 3.40282e+38 + Expected (operandRight): 3.402823e+38 (0x1.fffffep+127) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: inf != -max) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : inf - Expected (operandRight): -3.40282e+38 + Expected (operandRight): -3.402823e+38 (-0x1.fffffep+127) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: max != inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 3.40282e+38 + Actual (operandLeft) : 3.402823e+38 (0x1.fffffep+127) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: -max != inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : -3.40282e+38 + Actual (operandLeft) : -3.402823e+38 (-0x1.fffffep+127) Expected (operandRight): inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: -inf != max) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): 3.40282e+38 + Expected (operandRight): 3.402823e+38 (0x1.fffffep+127) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: -inf != -max) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : -inf - Expected (operandRight): -3.40282e+38 + Expected (operandRight): -3.402823e+38 (-0x1.fffffep+127) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: max != -inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 3.40282e+38 + Actual (operandLeft) : 3.402823e+38 (0x1.fffffep+127) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL: -max != -inf) Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : -3.40282e+38 + Actual (operandLeft) : -3.402823e+38 (-0x1.fffffep+127) Expected (operandRight): -inf Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::float16Comparisons(should FAIL 1) Compared qfloat16s are not the same (fuzzy compare) - Actual (operandLeft) : 1 - Expected (operandRight): 3 + Actual (operandLeft) : 1 (0x1p+0) + Expected (operandRight): 3 (0x1.8p+1) 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.01 - Expected (operandRight): 0.03 + Actual (operandLeft) : 0.01 (0x1.47cp-7) + Expected (operandRight): 0.03 (0x1.eb8p-6) 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 + Actual (operandLeft) : 98 (0x1.88p+6) + Expected (operandRight): 99 (0x1.8cp+6) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::float16Comparisons(should PASS 3) FAIL! : tst_float::float16Comparisons(should FAIL 4) Compared qfloat16s are not the same (fuzzy compare) - Actual (operandLeft) : 0.01 - Expected (operandRight): 0.0097 + Actual (operandLeft) : 0.01 (0x1.47cp-7) + Expected (operandRight): 0.009697 (0x1.3dcp-7) 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 + Actual (operandLeft) : 5.939e+04 (0x1.dp+15) + Expected (operandRight): 5.882e+04 (0x1.cb8p+15) 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 + Expected (operandRight): 0 (0x0p+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 + Actual (operandLeft) : 0 (0x0p+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 + Expected (operandRight): 1 (0x1p+0) 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 + Actual (operandLeft) : 1 (0x1p+0) Expected (operandRight): nan Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::float16Comparisons(should PASS: inf == inf) @@ -332,80 +332,84 @@ FAIL! : tst_float::float16Comparisons(should FAIL: nan != -inf) Compared qfloat 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 + Expected (operandRight): 0 (0x0p+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 + Actual (operandLeft) : 0 (0x0p+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 + Expected (operandRight): 0 (0x0p+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 + Actual (operandLeft) : 0 (0x0p+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 + Expected (operandRight): 1 (0x1p+0) 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 + Actual (operandLeft) : 1 (0x1p+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 + Expected (operandRight): 1 (0x1p+0) 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 + Actual (operandLeft) : 1 (0x1p+0) 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 + Expected (operandRight): 6.55e+04 (0x1.ffcp+15) 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 + Expected (operandRight): -6.55e+04 (-0x1.ffcp+15) 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 + Actual (operandLeft) : 6.55e+04 (0x1.ffcp+15) 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 + Actual (operandLeft) : -6.55e+04 (-0x1.ffcp+15) 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 + Expected (operandRight): 6.55e+04 (0x1.ffcp+15) 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 + Expected (operandRight): -6.55e+04 (-0x1.ffcp+15) 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 + Actual (operandLeft) : 6.55e+04 (0x1.ffcp+15) 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 + Actual (operandLeft) : -6.55e+04 (-0x1.ffcp+15) 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 + Actual (t1): 1 (0x1p+0) + Expected (t3): 3 (0x1.8p+1) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::compareFloatTests(1e-5) Compared floats are not the same (fuzzy compare) - Actual (t1): 1e-05 - Expected (t3): 3e-05 + Actual (t1): 1e-05 (0x1.4f8b58p-17) + Expected (t3): 3e-05 (0x1.f75104p-16) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::compareFloatTests(1e+7) Compared floats are not the same (fuzzy compare) - Actual (t1): 1e+07 - Expected (t3): 3e+07 + Actual (t1): 1e+07 (0x1.312dp+23) + Expected (t3): 3e+07 (0x1.c9c38p+24) + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] +FAIL! : tst_float::compareQListDouble() Compared lists differ at index 0. + Actual (double1): 1.5 (0x1.8p+0) + Expected (double2): 1 (0x1p+0) Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::cleanupTestCase() -Totals: 23 passed, 96 failed, 0 skipped, 0 blacklisted, 0ms +Totals: 23 passed, 97 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_float ********* diff --git a/tests/auto/testlib/selftests/float/tst_float.cpp b/tests/auto/testlib/selftests/float/tst_float.cpp index 9af14f1e89d..bc36a6ac442 100644 --- a/tests/auto/testlib/selftests/float/tst_float.cpp +++ b/tests/auto/testlib/selftests/float/tst_float.cpp @@ -21,6 +21,7 @@ private slots: void float16Comparisons_data() const; void compareFloatTests() const; void compareFloatTests_data() const; + void compareQListDouble() const; }; template<typename F> @@ -202,6 +203,13 @@ void tst_float::compareFloatTests_data() const QTest::newRow("1e+7") << 1e+7f; } +void tst_float::compareQListDouble() const +{ + QList<double> double1; double1 << 1.5 << 2 << 3; + QList<double> double2; double2 << 1 << 2 << 4; + QCOMPARE(double1, double2); +} + QTEST_MAIN(tst_float) #include "tst_float.moc" diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index a8dd8c6fc5a..bc3517a9e4a 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -16,11 +16,11 @@ QT_REQUIRE_CONFIG(process); #include <QtCore/QFileInfo> #include <QtCore/QDir> #include <QtCore/QTemporaryDir> +#include <QtCore/QProcess> #include <QTest> -#include <QProcess> - +#include <regex> #include <private/cycle_include_p.h> #include <QtTest/private/qemulationdetector_p.h> @@ -88,7 +88,8 @@ static bool compareBenchmarkResult(BenchmarkResult const &r1, BenchmarkResult co // Split the passed block of text into an array of lines, replacing any // filenames and line numbers with generic markers to avoid failing the test -// due to compiler-specific behaviour. +// due to compiler-specific behavior. For some known differences in output, +// it normalizes the stored text. static QList<QByteArray> splitLines(QByteArray ba) { ba.replace('\r', ""); @@ -114,6 +115,32 @@ static QList<QByteArray> splitLines(QByteArray ba) } line.replace(index, end-index + 1, markers[j][1]); } + + // There's some difference on how floating point numbers are printed by + // the various snprintf(), both in decimal and in hexadecimal form. The + // following regex catches them so we can normalize the output to the + // current running libc. + // + // Examples (most but not all attested): + // 1 0x1p+0 0x8p-3 + // 1.00000000000000000 0x1.0000000000000p+0 + // 1.5 0x1.8p+0 0xcp-3 + // 1e6 1e+06 1e+6 + // 1e-7 1e-07 1e-007 + // -1.797693134862316e+308 -0xf.ffffffffffff8p+1020 -0x1.fffffffffffffp+1023 + static std::regex fpValueRx(R"(-?\d+(?:\.\d*)?(?:e[-+]\d\d+)? \((-?0x[\da-f.]+p[-+]?\d+)\))"); + if (std::cmatch match; std::regex_search(line.cbegin(), line.cend(), match, fpValueRx)) { + if (double value; sscanf(match[1].first, "%la", &value) == 1) { + // remove the decimal and hexadecimal string representations + line.truncate(match[0].first - line.cbegin()); + + // append normalized hexfloat + // this won't fail and the buffer is definitely big enough + char buf[128]; + int n = snprintf(buf, sizeof(buf), "%a", value); + line += std::string_view(buf, n); + } + } } return out; |