From 58f1c0c146aa678b8140cc17388b5e7f3997fcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 29 Jul 2021 16:48:00 +0200
Subject: testlib: Don't report JUnit errors attribute without any <error>
 elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The errors attribute on the <testsuite> element represents the number of
<error> elements, but we do not produce any at the moment.

Pick-to: 6.2
Task-number: QTBUG-95424
Change-Id: I7196d622a9a6bbb7e79ed2c2886984d539abb1da
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 tests/auto/testlib/selftests/expected_assert.junitxml            | 2 +-
 tests/auto/testlib/selftests/expected_badxml.junitxml            | 2 +-
 tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml | 2 +-
 tests/auto/testlib/selftests/expected_benchlibcounting.junitxml  | 2 +-
 tests/auto/testlib/selftests/expected_blacklisted.junitxml       | 2 +-
 tests/auto/testlib/selftests/expected_commandlinedata.junitxml   | 2 +-
 tests/auto/testlib/selftests/expected_counting.junitxml          | 2 +-
 tests/auto/testlib/selftests/expected_expectfail.junitxml        | 2 +-
 tests/auto/testlib/selftests/expected_faildatatype.junitxml      | 2 +-
 tests/auto/testlib/selftests/expected_failfetchtype.junitxml     | 2 +-
 tests/auto/testlib/selftests/expected_fetchbogus.junitxml        | 2 +-
 tests/auto/testlib/selftests/expected_findtestdata.junitxml      | 2 +-
 tests/auto/testlib/selftests/expected_globaldata.junitxml        | 2 +-
 tests/auto/testlib/selftests/expected_junit.junitxml             | 2 +-
 tests/auto/testlib/selftests/expected_maxwarnings.junitxml       | 2 +-
 tests/auto/testlib/selftests/expected_signaldumper.junitxml      | 2 +-
 tests/auto/testlib/selftests/expected_silent.junitxml            | 2 +-
 tests/auto/testlib/selftests/expected_singleskip.junitxml        | 2 +-
 tests/auto/testlib/selftests/expected_skip.junitxml              | 2 +-
 tests/auto/testlib/selftests/expected_skipcleanup.junitxml       | 2 +-
 tests/auto/testlib/selftests/expected_skipinit.junitxml          | 2 +-
 tests/auto/testlib/selftests/expected_skipinitdata.junitxml      | 2 +-
 tests/auto/testlib/selftests/expected_strcmp.junitxml            | 2 +-
 tests/auto/testlib/selftests/expected_subtest.junitxml           | 2 +-
 tests/auto/testlib/selftests/expected_verbose1.junitxml          | 2 +-
 tests/auto/testlib/selftests/expected_verbose2.junitxml          | 2 +-
 tests/auto/testlib/selftests/expected_warnings.junitxml          | 2 +-
 tests/auto/testlib/selftests/expected_watchdog.junitxml          | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'tests/auto/testlib/selftests')

diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml
index dbe35c0f7f..1af0124166 100644
--- a/tests/auto/testlib/selftests/expected_assert.junitxml
+++ b/tests/auto/testlib/selftests/expected_assert.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml
index 31317ecc17..9483c5e01c 100644
--- a/tests/auto/testlib/selftests/expected_badxml.junitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="16" failures="5" errors="13" time="@TEST_DURATION@">
+<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="16" failures="5" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
index ed546cbb94..e0e1d7fe6d 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
index c5e4641903..ee308c0554 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
index 34b3e37966..823b6667fa 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="8" time="@TEST_DURATION@">
+<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
index 202a9eaa27..b0e686d7b7 100644
--- a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="6" time="@TEST_DURATION@">
+<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml
index 5575d0805b..19dcb2fcc1 100644
--- a/tests/auto/testlib/selftests/expected_counting.junitxml
+++ b/tests/auto/testlib/selftests/expected_counting.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="10" time="@TEST_DURATION@">
+<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml
index c26b9cfa8d..6058ee5a85 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.junitxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="24" failures="6" errors="13" time="@TEST_DURATION@">
+<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="24" failures="6" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
index 0f7d4856cd..3b132c4c54 100644
--- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml
+++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="2" time="@TEST_DURATION@">
+<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
index dd3a1076e1..6241138083 100644
--- a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
+++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
index db7d4e8fc4..72c4058e3d 100644
--- a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
index 78dbc575c2..c21c3cfc81 100644
--- a/tests/auto/testlib/selftests/expected_findtestdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml
index b1d1794680..b8362ec6e4 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.junitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="15" failures="0" errors="43" time="@TEST_DURATION@">
+<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="15" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_junit.junitxml b/tests/auto/testlib/selftests/expected_junit.junitxml
index 57e449238c..30cc0d4976 100644
--- a/tests/auto/testlib/selftests/expected_junit.junitxml
+++ b/tests/auto/testlib/selftests/expected_junit.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_JUnit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="3" errors="5" time="@TEST_DURATION@">
+<testsuite name="tst_JUnit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="3" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
index 7f01c69eba..052395d573 100644
--- a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="2002" time="@TEST_DURATION@">
+<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
index 37e4b38844..396d11fb36 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="21" failures="0" errors="124" time="@TEST_DURATION@">
+<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="21" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_silent.junitxml b/tests/auto/testlib/selftests/expected_silent.junitxml
index 0130b4700e..d05a3a0c7b 100644
--- a/tests/auto/testlib/selftests/expected_silent.junitxml
+++ b/tests/auto/testlib/selftests/expected_silent.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="9" time="@TEST_DURATION@">
+<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_singleskip.junitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml
index c596de7560..704c820d3f 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.junitxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml
index f99358d10d..1a09b2f06b 100644
--- a/tests/auto/testlib/selftests/expected_skip.junitxml
+++ b/tests/auto/testlib/selftests/expected_skip.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="6" failures="0" errors="4" time="@TEST_DURATION@">
+<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="6" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
index c576d43f2e..e8d1717016 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml
index a4a028f172..803e5e2749 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
index f2c8e92b45..497b9ec8cb 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml
index fb753a34ea..0fa2a3851a 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.junitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="8" failures="5" errors="3" time="@TEST_DURATION@">
+<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="8" failures="5" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml
index 8d0cfe001b..0a67143b04 100644
--- a/tests/auto/testlib/selftests/expected_subtest.junitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="2" errors="31" time="@TEST_DURATION@">
+<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="2" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml
index 5575d0805b..19dcb2fcc1 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.junitxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="10" time="@TEST_DURATION@">
+<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml
index 0c7a46c8ec..cd61538f86 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.junitxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="28" time="@TEST_DURATION@">
+<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml
index 328e2fab06..a8db9077f4 100644
--- a/tests/auto/testlib/selftests/expected_warnings.junitxml
+++ b/tests/auto/testlib/selftests/expected_warnings.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="4" errors="17" time="@TEST_DURATION@">
+<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="4" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml
index e862d4c358..a5f7f07808 100644
--- a/tests/auto/testlib/selftests/expected_watchdog.junitxml
+++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
-- 
cgit v1.2.3