diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-04 11:33:10 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-04 17:38:40 +0200 |
| commit | 0f7987f0c934b311bd39a5a496ffb0c6128eb8df (patch) | |
| tree | dea392deb3c43e377a224271c4f450dcff3fc76f /tests/auto/testlib/selftests/expected_float.junitxml | |
| parent | ea7d85457d30e915ad470919d2e74867cba9cad8 (diff) | |
| parent | f0ea852d4dd6b3139869a952ee92e74cd367866d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/text/qlocale.cpp
src/network/access/qnetworkaccessmanager.cpp
Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt
Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01
Diffstat (limited to 'tests/auto/testlib/selftests/expected_float.junitxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_float.junitxml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/testlib/selftests/expected_float.junitxml b/tests/auto/testlib/selftests/expected_float.junitxml index 602f9252a4..51a711efb7 100644 --- a/tests/auto/testlib/selftests/expected_float.junitxml +++ b/tests/auto/testlib/selftests/expected_float.junitxml @@ -17,8 +17,8 @@ Actual (operandLeft) : 999999999999 Expected (operandRight): 999999999998" result="fail"/> <failure tag="should FAIL 4" message="Compared doubles are not the same (fuzzy compare) - Actual (operandLeft) : 9.99999999999e-311 - Expected (operandRight): 9.99999999997e-311" result="fail"/> + Actual (operandLeft) : 1e-12 + Expected (operandRight): 9.99999999999e-13" result="fail"/> <failure tag="should FAIL 5" message="Compared doubles are not the same (fuzzy compare) Actual (operandLeft) : 9.99999999999e+306 Expected (operandRight): 9.99999999997e+306" result="fail"/> @@ -106,14 +106,14 @@ Actual (operandLeft) : 1 Expected (operandRight): 3" result="fail"/> <failure tag="should FAIL 2" message="Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 1e-07 - Expected (operandRight): 3e-07" result="fail"/> + Actual (operandLeft) : 1e-05 + Expected (operandRight): 3e-05" result="fail"/> <failure tag="should FAIL 3" message="Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 99999 Expected (operandRight): 99998" result="fail"/> <failure tag="should FAIL 4" message="Compared floats are not the same (fuzzy compare) - Actual (operandLeft) : 9.9999e-40 - Expected (operandRight): 9.99971e-40" result="fail"/> + Actual (operandLeft) : 1.00001e-05 + Expected (operandRight): 9.9999e-06" result="fail"/> <failure tag="should FAIL 5" message="Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 9.9999e+37 Expected (operandRight): 9.9997e+37" result="fail"/> @@ -201,14 +201,14 @@ Actual (operandLeft) : 1 Expected (operandRight): 3" result="fail"/> <failure tag="should FAIL 2" message="Compared qfloat16s are not the same (fuzzy compare) - Actual (operandLeft) : 0.0001 - Expected (operandRight): 0.0003" result="fail"/> + Actual (operandLeft) : 0.000999 + Expected (operandRight): 0.003" result="fail"/> <failure tag="should FAIL 3" message="Compared qfloat16s are not the same (fuzzy compare) Actual (operandLeft) : 98 Expected (operandRight): 99" result="fail"/> <failure tag="should FAIL 4" message="Compared qfloat16s are not the same (fuzzy compare) - Actual (operandLeft) : 5.93e-05 - Expected (operandRight): 5.87e-05" result="fail"/> + Actual (operandLeft) : 0.00101 + Expected (operandRight): 0.00099" result="fail"/> <failure tag="should FAIL 5" message="Compared qfloat16s are not the same (fuzzy compare) Actual (operandLeft) : 5.94e+04 Expected (operandRight): 5.88e+04" result="fail"/> @@ -295,9 +295,9 @@ <failure tag="1e0" message="Compared floats are not the same (fuzzy compare) Actual (t1): 1 Expected (t3): 3" result="fail"/> - <failure tag="1e-7" message="Compared floats are not the same (fuzzy compare) - Actual (t1): 1e-07 - Expected (t3): 3e-07" result="fail"/> + <failure tag="1e-5" message="Compared floats are not the same (fuzzy compare) + Actual (t1): 1e-05 + Expected (t3): 3e-05" result="fail"/> <failure tag="1e+7" message="Compared floats are not the same (fuzzy compare) Actual (t1): 1e+07 Expected (t3): 3e+07" result="fail"/> |