Skip to content

Instantly share code, notes, and snippets.

@torarnv
Created July 28, 2021 09:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save torarnv/92f46fb5e899b6c988b4f5484867949a to your computer and use it in GitHub Desktop.
Save torarnv/92f46fb5e899b6c988b4f5484867949a to your computer and use it in GitHub Desktop.
diff --git i/tests/auto/testlib/selftests/expected_float.junitxml w/tests/auto/testlib/selftests/expected_float.junitxml
index c2989749671..3c39e9a3768 100644
--- i/tests/auto/testlib/selftests/expected_float.junitxml
+++ w/tests/auto/testlib/selftests/expected_float.junitxml
@@ -201,18 +201,9 @@
Actual (operandLeft) : 1
Expected (operandRight): 3" tag="should FAIL 1"/>
<failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.001
- Expected (operandRight): 0.003" tag="should FAIL 2"/>
- <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
Actual (operandLeft) : 98
Expected (operandRight): 99" tag="should FAIL 3"/>
<failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.001
- Expected (operandRight): &#x002D;0.001" tag="should PASS 3"/>
- <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.00101
- Expected (operandRight): 0.00099" tag="should FAIL 4"/>
- <failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
Actual (operandLeft) : 5.94e+04
Expected (operandRight): 5.88e+04" tag="should FAIL 5"/>
<failure result="fail" message="Compared qfloat16s are not the same (fuzzy compare)
diff --git i/tests/auto/testlib/selftests/expected_float.lightxml w/tests/auto/testlib/selftests/expected_float.lightxml
index cf82929fd02..72b5ed9e23b 100644
--- i/tests/auto/testlib/selftests/expected_float.lightxml
+++ w/tests/auto/testlib/selftests/expected_float.lightxml
@@ -437,11 +437,8 @@
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 1]]></DataTag>
</Incident>
-<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should FAIL 2]]></DataTag>
- <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.000999
- Expected (operandRight): 0.003]]></Description>
</Incident>
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 2]]></DataTag>
@@ -455,11 +452,8 @@
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 3]]></DataTag>
</Incident>
-<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should FAIL 4]]></DataTag>
- <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.00101
- Expected (operandRight): 0.00099]]></Description>
</Incident>
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 4]]></DataTag>
diff --git i/tests/auto/testlib/selftests/expected_float.tap w/tests/auto/testlib/selftests/expected_float.tap
index 330e5248b97..e94450b8231 100644
--- i/tests/auto/testlib/selftests/expected_float.tap
+++ w/tests/auto/testlib/selftests/expected_float.tap
@@ -772,18 +772,7 @@ not ok 78 - float16Comparisons(should FAIL 1)
line: 0
...
ok 79 - float16Comparisons(should PASS 1)
-not ok 80 - float16Comparisons(should FAIL 2)
- ---
- type: QCOMPARE
- message: Compared qfloat16s are not the same (fuzzy compare)
- wanted: 0.003 (operandRight)
- found: 0.000999 (operandLeft)
- expected: 0.003 (operandRight)
- actual: 0.000999 (operandLeft)
- at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:0)
- file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
- line: 0
- ...
+ok 80 - float16Comparisons(should FAIL 2)
ok 81 - float16Comparisons(should PASS 2)
not ok 82 - float16Comparisons(should FAIL 3)
---
@@ -798,18 +787,7 @@ not ok 82 - float16Comparisons(should FAIL 3)
line: 0
...
ok 83 - float16Comparisons(should PASS 3)
-not ok 84 - float16Comparisons(should FAIL 4)
- ---
- type: QCOMPARE
- message: Compared qfloat16s are not the same (fuzzy compare)
- wanted: 0.00099 (operandRight)
- found: 0.00101 (operandLeft)
- expected: 0.00099 (operandRight)
- actual: 0.00101 (operandLeft)
- at: tst_float::float16Comparisons() (qtbase/tests/auto/testlib/selftests/float/tst_float.cpp:0)
- file: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp
- line: 0
- ...
+ok 84 - float16Comparisons(should FAIL 4)
ok 85 - float16Comparisons(should PASS 4)
not ok 86 - float16Comparisons(should FAIL 5)
---
@@ -1177,5 +1155,5 @@ not ok 118 - compareFloatTests(1e+7)
ok 119 - cleanupTestCase()
1..119
# tests 119
-# pass 23
-# fail 96
+# pass 25
+# fail 94
diff --git i/tests/auto/testlib/selftests/expected_float.teamcity w/tests/auto/testlib/selftests/expected_float.teamcity
index f8d65a71c7b..f6dd1c147a3 100644
--- i/tests/auto/testlib/selftests/expected_float.teamcity
+++ w/tests/auto/testlib/selftests/expected_float.teamcity
@@ -221,7 +221,6 @@
##teamcity[testStarted name='float16Comparisons(should PASS 1)' flowId='tst_float']
##teamcity[testFinished name='float16Comparisons(should PASS 1)' flowId='tst_float']
##teamcity[testStarted name='float16Comparisons(should FAIL 2)' flowId='tst_float']
-##teamcity[testFailed name='float16Comparisons(should FAIL 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 0.000999|n Expected (operandRight): 0.003' flowId='tst_float']
##teamcity[testFinished name='float16Comparisons(should FAIL 2)' flowId='tst_float']
##teamcity[testStarted name='float16Comparisons(should PASS 2)' flowId='tst_float']
##teamcity[testFinished name='float16Comparisons(should PASS 2)' flowId='tst_float']
@@ -231,7 +230,6 @@
##teamcity[testStarted name='float16Comparisons(should PASS 3)' flowId='tst_float']
##teamcity[testFinished name='float16Comparisons(should PASS 3)' flowId='tst_float']
##teamcity[testStarted name='float16Comparisons(should FAIL 4)' flowId='tst_float']
-##teamcity[testFailed name='float16Comparisons(should FAIL 4)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared qfloat16s are not the same (fuzzy compare)|n Actual (operandLeft) : 0.00101|n Expected (operandRight): 0.00099' flowId='tst_float']
##teamcity[testFinished name='float16Comparisons(should FAIL 4)' flowId='tst_float']
##teamcity[testStarted name='float16Comparisons(should PASS 4)' flowId='tst_float']
##teamcity[testFinished name='float16Comparisons(should PASS 4)' flowId='tst_float']
diff --git i/tests/auto/testlib/selftests/expected_float.txt w/tests/auto/testlib/selftests/expected_float.txt
index 25c8c6b6de5..be2ac789d7e 100644
--- i/tests/auto/testlib/selftests/expected_float.txt
+++ w/tests/auto/testlib/selftests/expected_float.txt
@@ -268,20 +268,14 @@ FAIL! : tst_float::float16Comparisons(should FAIL 1) Compared qfloat16s are not
Expected (operandRight): 3
Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
PASS : tst_float::float16Comparisons(should PASS 1)
-FAIL! : tst_float::float16Comparisons(should FAIL 2) Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.000999
- Expected (operandRight): 0.003
- Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS : tst_float::float16Comparisons(should FAIL 2)
PASS : tst_float::float16Comparisons(should PASS 2)
FAIL! : tst_float::float16Comparisons(should FAIL 3) Compared qfloat16s are not the same (fuzzy compare)
Actual (operandLeft) : 98
Expected (operandRight): 99
Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
PASS : tst_float::float16Comparisons(should PASS 3)
-FAIL! : tst_float::float16Comparisons(should FAIL 4) Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.00101
- Expected (operandRight): 0.00099
- Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
+PASS : tst_float::float16Comparisons(should FAIL 4)
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
@@ -407,5 +401,5 @@ FAIL! : tst_float::compareFloatTests(1e+7) Compared floats are not the same (fu
Expected (t3): 3e+07
Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)]
PASS : tst_float::cleanupTestCase()
-Totals: 23 passed, 96 failed, 0 skipped, 0 blacklisted, 0ms
+Totals: 25 passed, 94 failed, 0 skipped, 0 blacklisted, 0ms
********* Finished testing of tst_float *********
diff --git i/tests/auto/testlib/selftests/expected_float.xml w/tests/auto/testlib/selftests/expected_float.xml
index 8ddc72a9176..9c624bf09eb 100644
--- i/tests/auto/testlib/selftests/expected_float.xml
+++ w/tests/auto/testlib/selftests/expected_float.xml
@@ -439,11 +439,8 @@
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 1]]></DataTag>
</Incident>
-<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should FAIL 2]]></DataTag>
- <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.000999
- Expected (operandRight): 0.003]]></Description>
</Incident>
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 2]]></DataTag>
@@ -457,11 +454,8 @@
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 3]]></DataTag>
</Incident>
-<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0">
+<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should FAIL 4]]></DataTag>
- <Description><![CDATA[Compared qfloat16s are not the same (fuzzy compare)
- Actual (operandLeft) : 0.00101
- Expected (operandRight): 0.00099]]></Description>
</Incident>
<Incident type="pass" file="" line="0">
<DataTag><![CDATA[should PASS 4]]></DataTag>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment