From 304ec18a1ada480f45d1831c24af9b341cf62b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 22 Jul 2020 14:16:45 +0200
Subject: testlib selftest: rebaseline benchlibcallgrind results

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>
---
 tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml | 9 ---------
 tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml | 6 ------
 tests/auto/testlib/selftests/expected_benchlibcallgrind.tap      | 6 ------
 tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity | 2 --
 tests/auto/testlib/selftests/expected_benchlibcallgrind.xml      | 9 ---------
 5 files changed, 32 deletions(-)

(limited to 'tests/auto/testlib')

diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
index 95d90e6ee7..8f1b2ebfea 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
@@ -14,12 +14,3 @@
 <![CDATA[This test is only defined for gcc and x86.]]>
   </system-err>
 </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>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
index ea5374985d..dab06896d0 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
@@ -3,11 +3,6 @@
     <QtBuild/>
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
-<Environment>
-    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
-    <QtBuild/>
-    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
-</Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
@@ -23,4 +18,3 @@
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>
-<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.tap b/tests/auto/testlib/selftests/expected_benchlibcallgrind.tap
index 953756ac9e..da30082eaf 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.tap
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.tap
@@ -1,7 +1,5 @@
 TAP version 13
 # tst_BenchlibCallgrind
-TAP version 13
-# tst_BenchlibCallgrind
 ok 1 - initTestCase()
 ok 2 - twoHundredMillionInstructions() # SKIP This test is only defined for gcc and x86.
 ok 3 - cleanupTestCase()
@@ -9,7 +7,3 @@ ok 3 - cleanupTestCase()
 # tests 3
 # pass 2
 # fail 0
-1..0
-# tests 0
-# pass 0
-# fail 0
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity b/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity
index 11de23ccc2..9499fed8ce 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity
@@ -1,9 +1,7 @@
 ##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind']
-##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind']
 ##teamcity[testStarted 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[testStarted 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']
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
index 14433e719d..14ab86b45d 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
@@ -5,13 +5,6 @@
     <QtBuild/>
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </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">
 <Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
@@ -28,5 +21,3 @@
 </TestFunction>
 <Duration msecs="0"/>
 </TestCase>
-<Duration msecs="0"/>
-</TestCase>
-- 
cgit v1.2.3