1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testlib selftest: rebaseline benchlibcallgrind results

Browse Source 
The logic was changed in eb52d78e90ad8870a to only produce a single
result for all the benchmark iterations, but only the plain text
output was rebaselined. This was not caught by the test since we
only run this test with the plain test logger. Regenerating the
results with the python script however runs it with all loggers,
so let's fix the baseline.

Change-Id: I9ebe8a59ac3ab36694a739f98dbfffbae9a08552
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-07-22 14:16:45 +02:00
parent 61b1146e5a
commit 304ec18a1a
5 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
View File

@ -14,12 +14,3 @@
<![CDATA[This test is only defined for gcc and x86.]]> <![CDATA[This test is only defined for gcc and x86.]]>
</system-err> </system-err>
</testsuite> </testsuite>
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite errors="0" failures="0" tests="0" name="tst_BenchlibCallgrind">
<properties>
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
<property value="" name="QtBuild"/>
</properties>
<system-err/>
</testsuite>

6
tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
View File

@ -3,11 +3,6 @@
<QtBuild/> <QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment> </Environment>
<Environment>
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
<QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase"> <TestFunction name="initTestCase">
<Incident type="pass" file="" line="0" /> <Incident type="pass" file="" line="0" />
<Duration msecs="0"/> <Duration msecs="0"/>
@ -23,4 +18,3 @@
<Duration msecs="0"/> <Duration msecs="0"/>
</TestFunction> </TestFunction>
<Duration msecs="0"/> <Duration msecs="0"/>
<Duration msecs="0"/>

6
tests/auto/testlib/selftests/expected_benchlibcallgrind.tap
View File

@ -1,7 +1,5 @@
TAP version 13 TAP version 13
# tst_BenchlibCallgrind # tst_BenchlibCallgrind
TAP version 13
# tst_BenchlibCallgrind
ok 1 - initTestCase() ok 1 - initTestCase()
ok 2 - twoHundredMillionInstructions() # SKIP This test is only defined for gcc and x86. ok 2 - twoHundredMillionInstructions() # SKIP This test is only defined for gcc and x86.
ok 3 - cleanupTestCase() ok 3 - cleanupTestCase()
@ -9,7 +7,3 @@ ok 3 - cleanupTestCase()
# tests 3 # tests 3
# pass 2 # pass 2
# fail 0 # fail 0
1..0
# tests 0
# pass 0
# fail 0

2
tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity
View File

@ -1,9 +1,7 @@
##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind'] ##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind']
##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind']
##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibCallgrind'] ##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibCallgrind']
##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibCallgrind'] ##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibCallgrind']
##teamcity[testIgnored name='twoHundredMillionInstructions()' message='This test is only defined for gcc and x86. |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp(0)|]' flowId='tst_BenchlibCallgrind'] ##teamcity[testIgnored name='twoHundredMillionInstructions()' message='This test is only defined for gcc and x86. |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp(0)|]' flowId='tst_BenchlibCallgrind']
##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibCallgrind'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibCallgrind']
##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibCallgrind'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibCallgrind']
##teamcity[testSuiteFinished name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind'] ##teamcity[testSuiteFinished name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind']
##teamcity[testSuiteFinished name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind']

9
tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
View File

@ -5,13 +5,6 @@
<QtBuild/> <QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment> </Environment>
<?xml version="1.0" encoding="UTF-8"?>
<TestCase name="tst_BenchlibCallgrind">
<Environment>
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
<QtBuild/>
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase"> <TestFunction name="initTestCase">
<Incident type="pass" file="" line="0" /> <Incident type="pass" file="" line="0" />
<Duration msecs="0"/> <Duration msecs="0"/>
@ -28,5 +21,3 @@
</TestFunction> </TestFunction>
<Duration msecs="0"/> <Duration msecs="0"/>
</TestCase> </TestCase>
<Duration msecs="0"/>
</TestCase>