From 019588f30792132d9eca5dab11278547b287804e Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Thu, 24 Oct 2013 20:10:37 +0200
Subject: Testlib: Add test duration to xml output

[ChangeLog][QtTest] Added test duration to xml output.
When running tests with xml output a new tag of the form
<duration msecs="123"/> is added to each test function and the test as a
whole.

Change-Id: Ibc4db066b6acf5fac6c578f5e5ca5ce4b5d8ea8e
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
---
 tests/auto/testlib/selftests/expected_assert.lightxml    |  4 ++++
 tests/auto/testlib/selftests/expected_assert.xml         |  4 ++++
 tests/auto/testlib/selftests/expected_badxml.lightxml    |  6 ++++++
 tests/auto/testlib/selftests/expected_badxml.xml         |  6 ++++++
 .../testlib/selftests/expected_benchlibcounting.lightxml |  6 ++++++
 .../auto/testlib/selftests/expected_benchlibcounting.xml |  6 ++++++
 .../selftests/expected_benchlibeventcounter.lightxml     |  4 ++++
 .../testlib/selftests/expected_benchlibeventcounter.xml  |  4 ++++
 .../selftests/expected_benchlibtickcounter.lightxml      |  4 ++++
 .../testlib/selftests/expected_benchlibtickcounter.xml   |  4 ++++
 .../testlib/selftests/expected_benchlibwalltime.lightxml |  6 ++++++
 .../auto/testlib/selftests/expected_benchlibwalltime.xml |  6 ++++++
 tests/auto/testlib/selftests/expected_cmptest.lightxml   | 11 +++++++++++
 tests/auto/testlib/selftests/expected_cmptest.xml        | 11 +++++++++++
 .../testlib/selftests/expected_commandlinedata.lightxml  |  5 +++++
 .../auto/testlib/selftests/expected_commandlinedata.xml  |  5 +++++
 tests/auto/testlib/selftests/expected_counting.lightxml  | 16 ++++++++++++++++
 tests/auto/testlib/selftests/expected_counting.xml       | 16 ++++++++++++++++
 tests/auto/testlib/selftests/expected_datatable.lightxml | 11 +++++++++++
 tests/auto/testlib/selftests/expected_datatable.xml      | 11 +++++++++++
 tests/auto/testlib/selftests/expected_datetime.lightxml  |  5 +++++
 tests/auto/testlib/selftests/expected_datetime.xml       |  5 +++++
 .../testlib/selftests/expected_exceptionthrow.lightxml   |  3 +++
 tests/auto/testlib/selftests/expected_exceptionthrow.xml |  3 +++
 .../auto/testlib/selftests/expected_expectfail.lightxml  | 15 +++++++++++++++
 tests/auto/testlib/selftests/expected_expectfail.xml     | 15 +++++++++++++++
 .../auto/testlib/selftests/expected_failcleanup.lightxml |  4 ++++
 tests/auto/testlib/selftests/expected_failcleanup.xml    |  4 ++++
 tests/auto/testlib/selftests/expected_failinit.lightxml  |  3 +++
 tests/auto/testlib/selftests/expected_failinit.xml       |  3 +++
 .../testlib/selftests/expected_failinitdata.lightxml     |  2 ++
 tests/auto/testlib/selftests/expected_failinitdata.xml   |  2 ++
 .../auto/testlib/selftests/expected_fetchbogus.lightxml  |  3 +++
 tests/auto/testlib/selftests/expected_fetchbogus.xml     |  3 +++
 .../testlib/selftests/expected_findtestdata.lightxml     |  4 ++++
 tests/auto/testlib/selftests/expected_findtestdata.xml   |  4 ++++
 .../auto/testlib/selftests/expected_globaldata.lightxml  |  7 +++++++
 tests/auto/testlib/selftests/expected_globaldata.xml     |  7 +++++++
 .../auto/testlib/selftests/expected_longstring.lightxml  |  4 ++++
 tests/auto/testlib/selftests/expected_longstring.xml     |  4 ++++
 .../auto/testlib/selftests/expected_maxwarnings.lightxml |  4 ++++
 tests/auto/testlib/selftests/expected_maxwarnings.xml    |  4 ++++
 .../auto/testlib/selftests/expected_singleskip.lightxml  |  4 ++++
 tests/auto/testlib/selftests/expected_singleskip.xml     |  4 ++++
 tests/auto/testlib/selftests/expected_skip.lightxml      |  6 ++++++
 tests/auto/testlib/selftests/expected_skip.xml           |  6 ++++++
 .../auto/testlib/selftests/expected_skipcleanup.lightxml |  4 ++++
 tests/auto/testlib/selftests/expected_skipcleanup.xml    |  4 ++++
 tests/auto/testlib/selftests/expected_skipinit.lightxml  |  3 +++
 tests/auto/testlib/selftests/expected_skipinit.xml       |  3 +++
 .../testlib/selftests/expected_skipinitdata.lightxml     |  2 ++
 tests/auto/testlib/selftests/expected_skipinitdata.xml   |  2 ++
 tests/auto/testlib/selftests/expected_strcmp.lightxml    |  9 +++++++++
 tests/auto/testlib/selftests/expected_strcmp.xml         |  9 +++++++++
 tests/auto/testlib/selftests/expected_subtest.lightxml   |  6 ++++++
 tests/auto/testlib/selftests/expected_subtest.xml        |  6 ++++++
 tests/auto/testlib/selftests/expected_verbose1.lightxml  | 16 ++++++++++++++++
 tests/auto/testlib/selftests/expected_verbose1.xml       | 16 ++++++++++++++++
 tests/auto/testlib/selftests/expected_verbose2.lightxml  | 16 ++++++++++++++++
 tests/auto/testlib/selftests/expected_verbose2.xml       | 16 ++++++++++++++++
 .../selftests/expected_verifyexceptionthrown.lightxml    | 12 ++++++++++++
 .../testlib/selftests/expected_verifyexceptionthrown.xml | 12 ++++++++++++
 tests/auto/testlib/selftests/expected_warnings.lightxml  |  7 +++++++
 tests/auto/testlib/selftests/expected_warnings.xml       |  7 +++++++
 tests/auto/testlib/selftests/expected_xunit.lightxml     | 10 ++++++++++
 tests/auto/testlib/selftests/expected_xunit.xml          | 10 ++++++++++
 tests/auto/testlib/selftests/tst_selftests.cpp           |  6 ++++++
 67 files changed, 450 insertions(+)

(limited to 'tests/auto')

diff --git a/tests/auto/testlib/selftests/expected_assert.lightxml b/tests/auto/testlib/selftests/expected_assert.lightxml
index c2cc1da7ab..d2d4ae5153 100644
--- a/tests/auto/testlib/selftests/expected_assert.lightxml
+++ b/tests/auto/testlib/selftests/expected_assert.lightxml
@@ -4,9 +4,11 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testNumber1">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testNumber2">
 <Message type="qfatal" file="" line="0">
@@ -15,4 +17,6 @@
 <Incident type="fail" file="Unknown file" line="0">
     <Description><![CDATA[Received a fatal error.]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml
index 8dc20628af..9e5ea760ae 100644
--- a/tests/auto/testlib/selftests/expected_assert.xml
+++ b/tests/auto/testlib/selftests/expected_assert.xml
@@ -6,9 +6,11 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testNumber1">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testNumber2">
 <Message type="qfatal" file="" line="0">
@@ -17,5 +19,7 @@
 <Incident type="fail" file="Unknown file" line="0">
     <Description><![CDATA[Received a fatal error.]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml
index 222c396059..15981b12be 100644
--- a/tests/auto/testlib/selftests/expected_badxml.lightxml
+++ b/tests/auto/testlib/selftests/expected_badxml.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="badDataTag">
 <Message type="qdebug" file="" line="0">
@@ -70,6 +71,7 @@
     <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
 </Incident>
 <BenchmarkResult metric="Events" tag="pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" value="0" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="badMessage">
 <Message type="qdebug" file="" line="0">
@@ -100,12 +102,16 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[string 3]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failWithNoFile">
 <Incident type="fail" file="" line="0">
     <Description><![CDATA[failure message]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml
index 4b180dbd01..c3330a6b97 100644
--- a/tests/auto/testlib/selftests/expected_badxml.xml
+++ b/tests/auto/testlib/selftests/expected_badxml.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="badDataTag">
 <Message type="qdebug" file="" line="0">
@@ -72,6 +73,7 @@
     <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
 </Incident>
 <BenchmarkResult metric="Events" tag="pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" value="0" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="badMessage">
 <Message type="qdebug" file="" line="0">
@@ -102,13 +104,17 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[string 3]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failWithNoFile">
 <Incident type="fail" file="" line="0">
     <Description><![CDATA[failure message]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml
index f9e5924eef..08872be733 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml
@@ -4,21 +4,27 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="passingBenchmark">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="Events" tag="" value="0" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skippingBenchmark">
 <Message type="skip" file="tst_benchlibcounting.cpp" line="64">
     <Description><![CDATA[This is a skipping benchmark]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failingBenchmark">
 <Incident type="fail" file="tst_benchlibcounting.cpp" line="71">
     <Description><![CDATA[This is a failing benchmark]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xml b/tests/auto/testlib/selftests/expected_benchlibcounting.xml
index f3e674e7a3..ee6fd98ef2 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.xml
@@ -6,22 +6,28 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="passingBenchmark">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="Events" tag="" value="0" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skippingBenchmark">
 <Message type="skip" file="tst_benchlibcounting.cpp" line="64">
     <Description><![CDATA[This is a skipping benchmark]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failingBenchmark">
 <Incident type="fail" file="tst_benchlibcounting.cpp" line="71">
     <Description><![CDATA[This is a failing benchmark]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
index 3cb59d209b..cba91a374f 100644
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="events">
 <Incident type="pass" file="" line="0">
@@ -34,7 +35,10 @@
     <DataTag><![CDATA[100000]]></DataTag>
 </Incident>
 <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
index cead0adf8c..7d28975ead 100644
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="events">
 <Incident type="pass" file="" line="0">
@@ -36,8 +37,11 @@
     <DataTag><![CDATA[100000]]></DataTag>
 </Incident>
 <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml
index 665ba58689..97422240d9 100644
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml
@@ -4,11 +4,15 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="threeBillionTicks">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="CPUTicks" tag="" value="3.00001e+09" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
index 695b8f2134..24c2e51084 100644
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
@@ -6,12 +6,16 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="threeBillionTicks">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="CPUTicks" tag="" value="3.00002e+09" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml
index f9311e943e..b2e819b26d 100644
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml
@@ -4,19 +4,25 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="waitForOneThousand">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="1004" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="waitForFourThousand">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="4004" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="qbenchmark_once">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
index 41b39eb925..6ae355783a 100644
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
@@ -6,20 +6,26 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="waitForOneThousand">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="1008" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="waitForFourThousand">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="4002" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="qbenchmark_once">
 <Incident type="pass" file="" line="0" />
 <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml
index aebff4de61..a83a971d8a 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.lightxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml
@@ -4,12 +4,15 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compare_boolfuncs">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compare_pointerfuncs">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compare_tostring">
 <Incident type="fail" file="tst_cmptest.cpp" line="219">
@@ -39,6 +42,7 @@
    Actual   (actual)  : QVariant(PhonyClass,<value not representable as string>)
    Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQStringLists">
 <Incident type="pass" file="" line="0">
@@ -77,6 +81,7 @@
    Actual   (opA) size: '1'
    Expected (opB) size: '12']]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQListInt">
 <Incident type="fail" file="tst_cmptest.cpp" line="320">
@@ -84,6 +89,7 @@
    Actual   (int1): '3'
    Expected (int2): '4']]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQListDouble">
 <Incident type="fail" file="tst_cmptest.cpp" line="327">
@@ -91,6 +97,7 @@
    Actual   (double1): '1.5'
    Expected (double2): '1']]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQPixmaps">
 <Incident type="pass" file="" line="0">
@@ -121,6 +128,7 @@
     <DataTag><![CDATA[different pixels]]></DataTag>
     <Description><![CDATA[Compared values are not the same]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQImages">
 <Incident type="pass" file="" line="0">
@@ -157,7 +165,10 @@
     <DataTag><![CDATA[different pixels]]></DataTag>
     <Description><![CDATA[Compared values are not the same]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml
index 8a9f64d877..08a40fb466 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.xml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xml
@@ -6,12 +6,15 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compare_boolfuncs">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compare_pointerfuncs">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compare_tostring">
 <Incident type="fail" file="tst_cmptest.cpp" line="219">
@@ -41,6 +44,7 @@
    Actual   (actual)  : QVariant(PhonyClass,<value not representable as string>)
    Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQStringLists">
 <Incident type="pass" file="" line="0">
@@ -79,6 +83,7 @@
    Actual   (opA) size: '1'
    Expected (opB) size: '12']]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQListInt">
 <Incident type="fail" file="tst_cmptest.cpp" line="320">
@@ -86,6 +91,7 @@
    Actual   (int1): '3'
    Expected (int2): '4']]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQListDouble">
 <Incident type="fail" file="tst_cmptest.cpp" line="327">
@@ -93,6 +99,7 @@
    Actual   (double1): '1.5'
    Expected (double2): '1']]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQPixmaps">
 <Incident type="pass" file="" line="0">
@@ -123,6 +130,7 @@
     <DataTag><![CDATA[different pixels]]></DataTag>
     <Description><![CDATA[Compared values are not the same]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareQImages">
 <Incident type="pass" file="" line="0">
@@ -159,8 +167,11 @@
     <DataTag><![CDATA[different pixels]]></DataTag>
     <Description><![CDATA[Compared values are not the same]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.lightxml b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml
index 65062970f0..c11017f022 100644
--- a/tests/auto/testlib/selftests/expected_commandlinedata.lightxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTablePasses">
 <Message type="info" file="tst_commandlinedata.cpp" line="65">
@@ -41,6 +42,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTablePasses">
 <Message type="info" file="tst_commandlinedata.cpp" line="65">
@@ -50,7 +52,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xml b/tests/auto/testlib/selftests/expected_commandlinedata.xml
index 70ad6bbe0d..20dc0c6a7c 100644
--- a/tests/auto/testlib/selftests/expected_commandlinedata.xml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTablePasses">
 <Message type="info" file="tst_commandlinedata.cpp" line="65">
@@ -43,6 +44,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTablePasses">
 <Message type="info" file="tst_commandlinedata.cpp" line="65">
@@ -52,8 +54,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_counting.lightxml b/tests/auto/testlib/selftests/expected_counting.lightxml
index 5b0e947340..e5fe1ee3cf 100644
--- a/tests/auto/testlib/selftests/expected_counting.lightxml
+++ b/tests/auto/testlib/selftests/expected_counting.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassPass">
 <Incident type="pass" file="" line="0">
@@ -12,6 +13,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassSkip">
 <Incident type="pass" file="" line="0">
@@ -21,6 +23,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
 <Incident type="pass" file="" line="0">
@@ -30,6 +33,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
 <Message type="skip" file="tst_counting.cpp" line="118">
@@ -39,6 +43,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
 <Message type="skip" file="tst_counting.cpp" line="118">
@@ -49,6 +54,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
 <Message type="skip" file="tst_counting.cpp" line="118">
@@ -59,6 +65,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailPass">
 <Incident type="fail" file="tst_counting.cpp" line="115">
@@ -68,6 +75,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailSkip">
 <Incident type="fail" file="tst_counting.cpp" line="115">
@@ -78,6 +86,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
 <Incident type="fail" file="tst_counting.cpp" line="115">
@@ -88,6 +97,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInInit">
 <Incident type="pass" file="" line="0">
@@ -100,6 +110,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInCleanup">
 <Incident type="pass" file="" line="0">
@@ -116,6 +127,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInInit">
 <Incident type="pass" file="" line="0">
@@ -128,6 +140,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInCleanup">
 <Incident type="pass" file="" line="0">
@@ -144,7 +157,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_counting.xml b/tests/auto/testlib/selftests/expected_counting.xml
index 661a617aa0..e015dddcc6 100644
--- a/tests/auto/testlib/selftests/expected_counting.xml
+++ b/tests/auto/testlib/selftests/expected_counting.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassPass">
 <Incident type="pass" file="" line="0">
@@ -14,6 +15,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassSkip">
 <Incident type="pass" file="" line="0">
@@ -23,6 +25,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
 <Incident type="pass" file="" line="0">
@@ -32,6 +35,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
 <Message type="skip" file="tst_counting.cpp" line="118">
@@ -41,6 +45,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
 <Message type="skip" file="tst_counting.cpp" line="118">
@@ -51,6 +56,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
 <Message type="skip" file="tst_counting.cpp" line="118">
@@ -61,6 +67,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailPass">
 <Incident type="fail" file="tst_counting.cpp" line="115">
@@ -70,6 +77,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailSkip">
 <Incident type="fail" file="tst_counting.cpp" line="115">
@@ -80,6 +88,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
 <Incident type="fail" file="tst_counting.cpp" line="115">
@@ -90,6 +99,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInInit">
 <Incident type="pass" file="" line="0">
@@ -102,6 +112,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInCleanup">
 <Incident type="pass" file="" line="0">
@@ -118,6 +129,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInInit">
 <Incident type="pass" file="" line="0">
@@ -130,6 +142,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInCleanup">
 <Incident type="pass" file="" line="0">
@@ -146,8 +159,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_datatable.lightxml b/tests/auto/testlib/selftests/expected_datatable.lightxml
index b1442cfc10..6cc2d1c46f 100644
--- a/tests/auto/testlib/selftests/expected_datatable.lightxml
+++ b/tests/auto/testlib/selftests/expected_datatable.lightxml
@@ -4,12 +4,15 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleTestFunction1">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleTestFunction2">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTablePasses">
 <Incident type="pass" file="" line="0">
@@ -27,6 +30,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[fiveTablePasses_data 5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTableFailures">
 <Incident type="fail" file="tst_datatable.cpp" line="91">
@@ -49,6 +53,7 @@
     <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag>
     <Description><![CDATA['test' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="startsWithFailure">
 <Incident type="fail" file="tst_datatable.cpp" line="91">
@@ -67,6 +72,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[startsWithFailure_data 5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="endsWithFailure">
 <Incident type="pass" file="" line="0">
@@ -85,6 +91,7 @@
     <DataTag><![CDATA[endsWithFailure 5]]></DataTag>
     <Description><![CDATA['test' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failureInMiddle">
 <Incident type="pass" file="" line="0">
@@ -103,6 +110,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[failureInMiddle_data 5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveIsolatedFailures">
 <Incident type="fail" file="tst_datatable.cpp" line="173">
@@ -125,7 +133,10 @@
     <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag>
     <Description><![CDATA['!test' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_datatable.xml b/tests/auto/testlib/selftests/expected_datatable.xml
index c98e1ee44a..79963db0a4 100644
--- a/tests/auto/testlib/selftests/expected_datatable.xml
+++ b/tests/auto/testlib/selftests/expected_datatable.xml
@@ -6,12 +6,15 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleTestFunction1">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleTestFunction2">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTablePasses">
 <Incident type="pass" file="" line="0">
@@ -29,6 +32,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[fiveTablePasses_data 5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveTableFailures">
 <Incident type="fail" file="tst_datatable.cpp" line="91">
@@ -51,6 +55,7 @@
     <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag>
     <Description><![CDATA['test' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="startsWithFailure">
 <Incident type="fail" file="tst_datatable.cpp" line="91">
@@ -69,6 +74,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[startsWithFailure_data 5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="endsWithFailure">
 <Incident type="pass" file="" line="0">
@@ -87,6 +93,7 @@
     <DataTag><![CDATA[endsWithFailure 5]]></DataTag>
     <Description><![CDATA['test' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failureInMiddle">
 <Incident type="pass" file="" line="0">
@@ -105,6 +112,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[failureInMiddle_data 5]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fiveIsolatedFailures">
 <Incident type="fail" file="tst_datatable.cpp" line="173">
@@ -127,8 +135,11 @@
     <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag>
     <Description><![CDATA['!test' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_datetime.lightxml b/tests/auto/testlib/selftests/expected_datetime.lightxml
index 0594f4627d..02c60d04f9 100644
--- a/tests/auto/testlib/selftests/expected_datetime.lightxml
+++ b/tests/auto/testlib/selftests/expected_datetime.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="dateTime">
 <Incident type="fail" file="tst_datetime.cpp" line="65">
@@ -11,6 +12,7 @@
    Actual   (local): 2000/05/03 04:03:04.000[local time]
    Expected (utc)  : 2000/05/03 04:03:04.000[UTC]]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="qurl">
 <Incident type="pass" file="" line="0">
@@ -31,7 +33,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[same urls]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml
index c132a1fcf6..03aec4430e 100644
--- a/tests/auto/testlib/selftests/expected_datetime.xml
+++ b/tests/auto/testlib/selftests/expected_datetime.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="dateTime">
 <Incident type="fail" file="tst_datetime.cpp" line="65">
@@ -13,6 +14,7 @@
    Actual   (local): 2000/05/03 04:03:04.000[local time]
    Expected (utc)  : 2000/05/03 04:03:04.000[UTC]]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="qurl">
 <Incident type="pass" file="" line="0">
@@ -33,8 +35,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[same urls]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml
index 81c33cb26e..6c9675a2aa 100644
--- a/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml
@@ -4,9 +4,12 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="throwException">
 <Incident type="fail" file="/home/frederik/dev/qt/qt&#x002D;src&#x002D;dev/qtbase/src/testlib/qtestcase.cpp" line="2229">
     <Description><![CDATA[Caught unhandled exception]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xml b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
index 015f7f5f4b..87d9d2d431 100644
--- a/tests/auto/testlib/selftests/expected_exceptionthrow.xml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
@@ -6,10 +6,13 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="throwException">
 <Incident type="fail" file="/home/frederik/dev/qt/qt&#x002D;src&#x002D;dev/qtbase/src/testlib/qtestcase.cpp" line="2229">
     <Description><![CDATA[Caught unhandled exception]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml
index 3f262c6228..e5fcca5875 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.lightxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailAndContinue">
 <Message type="qdebug" file="" line="0">
@@ -16,6 +17,7 @@
     <Description><![CDATA[after]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailAndAbort">
 <Message type="qdebug" file="" line="0">
@@ -25,11 +27,13 @@
     <Description><![CDATA[This should xfail]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailTwice">
 <Incident type="fail" file="tst_expectfail.cpp" line="96">
     <Description><![CDATA[Already expecting a fail]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailWithQString">
 <Incident type="xfail" file="tst_expectfail.cpp" line="105">
@@ -39,6 +43,7 @@
     <Description><![CDATA[Bug 5 (The message)]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQVerify">
 <Incident type="pass" file="" line="0">
@@ -61,6 +66,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Continue]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQCompare">
 <Incident type="pass" file="" line="0">
@@ -83,11 +89,13 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Continue]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailOnWrongRow">
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[right row]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailOnAnyRow">
 <Incident type="xfail" file="tst_expectfail.cpp" line="208">
@@ -104,6 +112,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[second row]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailWithoutVerify">
 <Incident type="fail" file="" line="0">
@@ -114,11 +123,13 @@
     <DataTag><![CDATA[second row]]></DataTag>
     <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpass">
 <Incident type="xpass" file="tst_expectfail.cpp" line="228">
     <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassDataDrivenWithQVerify">
 <Incident type="xpass" file="tst_expectfail.cpp" line="250">
@@ -128,6 +139,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Pass]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassDataDrivenWithQCompare">
 <Incident type="xpass" file="tst_expectfail.cpp" line="271">
@@ -137,7 +149,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Pass]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml
index 31b61d8db2..14fee2129e 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.xml
+++ b/tests/auto/testlib/selftests/expected_expectfail.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailAndContinue">
 <Message type="qdebug" file="" line="0">
@@ -18,6 +19,7 @@
     <Description><![CDATA[after]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailAndAbort">
 <Message type="qdebug" file="" line="0">
@@ -27,11 +29,13 @@
     <Description><![CDATA[This should xfail]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailTwice">
 <Incident type="fail" file="tst_expectfail.cpp" line="96">
     <Description><![CDATA[Already expecting a fail]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailWithQString">
 <Incident type="xfail" file="tst_expectfail.cpp" line="105">
@@ -41,6 +45,7 @@
     <Description><![CDATA[Bug 5 (The message)]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQVerify">
 <Incident type="pass" file="" line="0">
@@ -63,6 +68,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Continue]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQCompare">
 <Incident type="pass" file="" line="0">
@@ -85,11 +91,13 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Continue]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailOnWrongRow">
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[right row]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailOnAnyRow">
 <Incident type="xfail" file="tst_expectfail.cpp" line="208">
@@ -106,6 +114,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[second row]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailWithoutVerify">
 <Incident type="fail" file="" line="0">
@@ -116,11 +125,13 @@
     <DataTag><![CDATA[second row]]></DataTag>
     <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpass">
 <Incident type="xpass" file="tst_expectfail.cpp" line="228">
     <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassDataDrivenWithQVerify">
 <Incident type="xpass" file="tst_expectfail.cpp" line="250">
@@ -130,6 +141,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Pass]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassDataDrivenWithQCompare">
 <Incident type="xpass" file="tst_expectfail.cpp" line="271">
@@ -139,8 +151,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[Pass]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_failcleanup.lightxml b/tests/auto/testlib/selftests/expected_failcleanup.lightxml
index 4ceff4eba8..cfc18ef5da 100644
--- a/tests/auto/testlib/selftests/expected_failcleanup.lightxml
+++ b/tests/auto/testlib/selftests/expected_failcleanup.lightxml
@@ -4,12 +4,16 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="aTestFunction">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="fail" file="tst_failcleanup.cpp" line="59">
     <Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xml b/tests/auto/testlib/selftests/expected_failcleanup.xml
index 79a66771cd..3aa7aa265d 100644
--- a/tests/auto/testlib/selftests/expected_failcleanup.xml
+++ b/tests/auto/testlib/selftests/expected_failcleanup.xml
@@ -6,13 +6,17 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="aTestFunction">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="fail" file="tst_failcleanup.cpp" line="59">
     <Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_failinit.lightxml b/tests/auto/testlib/selftests/expected_failinit.lightxml
index e10b3a476b..c0d193998d 100644
--- a/tests/auto/testlib/selftests/expected_failinit.lightxml
+++ b/tests/auto/testlib/selftests/expected_failinit.lightxml
@@ -6,7 +6,10 @@
 <Incident type="fail" file="tst_failinit.cpp" line="55">
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_failinit.xml b/tests/auto/testlib/selftests/expected_failinit.xml
index 3911253f61..70ad613f3f 100644
--- a/tests/auto/testlib/selftests/expected_failinit.xml
+++ b/tests/auto/testlib/selftests/expected_failinit.xml
@@ -8,8 +8,11 @@
 <Incident type="fail" file="tst_failinit.cpp" line="55">
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_failinitdata.lightxml b/tests/auto/testlib/selftests/expected_failinitdata.lightxml
index 743bc0d045..285471470f 100644
--- a/tests/auto/testlib/selftests/expected_failinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.lightxml
@@ -6,4 +6,6 @@
 <Incident type="fail" file="tst_failinitdata.cpp" line="56">
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xml b/tests/auto/testlib/selftests/expected_failinitdata.xml
index 6d5b386a3e..e86e102202 100644
--- a/tests/auto/testlib/selftests/expected_failinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.xml
@@ -8,5 +8,7 @@
 <Incident type="fail" file="tst_failinitdata.cpp" line="56">
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.lightxml b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml
index 1812c0e6b5..c5587cf031 100644
--- a/tests/auto/testlib/selftests/expected_fetchbogus.lightxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fetchBogus">
 <Message type="qfatal" file="" line="0">
@@ -14,4 +15,6 @@
     <DataTag><![CDATA[foo]]></DataTag>
     <Description><![CDATA[Received a fatal error.]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xml b/tests/auto/testlib/selftests/expected_fetchbogus.xml
index ee33a85dc4..40295bdebc 100644
--- a/tests/auto/testlib/selftests/expected_fetchbogus.xml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fetchBogus">
 <Message type="qfatal" file="" line="0">
@@ -16,5 +17,7 @@
     <DataTag><![CDATA[foo]]></DataTag>
     <Description><![CDATA[Received a fatal error.]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.lightxml b/tests/auto/testlib/selftests/expected_findtestdata.lightxml
index bf69bcb845..4c1c7298ed 100644
--- a/tests/auto/testlib/selftests/expected_findtestdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.lightxml
@@ -4,13 +4,17 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="paths">
 <Message type="warn" file="findtestdata.cpp" line="154">
     <Description><![CDATA[testdata testfile could not be located!]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xml b/tests/auto/testlib/selftests/expected_findtestdata.xml
index 8770730c76..b1f33abaf6 100644
--- a/tests/auto/testlib/selftests/expected_findtestdata.xml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.xml
@@ -6,14 +6,18 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="paths">
 <Message type="warn" file="findtestdata.cpp" line="154">
     <Description><![CDATA[testdata testfile could not be located!]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index 86418a4935..fd128d2c61 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml
@@ -7,6 +7,7 @@
     <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
@@ -85,12 +86,14 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
 <Message type="skip" file="tst_globaldata.cpp" line="129">
     <DataTag><![CDATA[1]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
@@ -117,6 +120,7 @@
     <DataTag><![CDATA[1:local 2]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local 2]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
@@ -176,10 +180,13 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
     <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index 10fd4fd571..0867619fde 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
@@ -9,6 +9,7 @@
     <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
@@ -87,12 +88,14 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
 <Message type="skip" file="tst_globaldata.cpp" line="129">
     <DataTag><![CDATA[1]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
@@ -119,6 +122,7 @@
     <DataTag><![CDATA[1:local 2]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local 2]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
@@ -178,11 +182,14 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
     <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_longstring.lightxml b/tests/auto/testlib/selftests/expected_longstring.lightxml
index 2b3a585bf2..45c6d3f78d 100644
--- a/tests/auto/testlib/selftests/expected_longstring.lightxml
+++ b/tests/auto/testlib/selftests/expected_longstring.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failWithLongString">
 <Incident type="fail" file="tst_longstring.cpp" line="67">
@@ -17,7 +18,10 @@ Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. M
 
 Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_longstring.xml b/tests/auto/testlib/selftests/expected_longstring.xml
index dd60dcd94c..efc29d6def 100644
--- a/tests/auto/testlib/selftests/expected_longstring.xml
+++ b/tests/auto/testlib/selftests/expected_longstring.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failWithLongString">
 <Incident type="fail" file="tst_longstring.cpp" line="67">
@@ -19,8 +20,11 @@ Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. M
 
 Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.lightxml b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml
index 054108fe6d..ce6d828eb2 100644
--- a/tests/auto/testlib/selftests/expected_maxwarnings.lightxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="warn">
 <Message type="qwarn" file="" line="0">
@@ -6013,7 +6014,10 @@
     <Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xml b/tests/auto/testlib/selftests/expected_maxwarnings.xml
index d5845ebf1d..758af9d6d5 100644
--- a/tests/auto/testlib/selftests/expected_maxwarnings.xml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="warn">
 <Message type="qwarn" file="" line="0">
@@ -6015,8 +6016,11 @@
     <Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_singleskip.lightxml b/tests/auto/testlib/selftests/expected_singleskip.lightxml
index 0581f8d974..685396a243 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.lightxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.lightxml
@@ -4,12 +4,16 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="myTest">
 <Message type="skip" file="tst_singleskip.cpp" line="56">
     <Description><![CDATA[skipping test]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml
index 7ebffb04cb..c10626ca41 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.xml
+++ b/tests/auto/testlib/selftests/expected_singleskip.xml
@@ -6,13 +6,17 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="myTest">
 <Message type="skip" file="tst_singleskip.cpp" line="56">
     <Description><![CDATA[skipping test]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_skip.lightxml b/tests/auto/testlib/selftests/expected_skip.lightxml
index 44428fbf3c..408bc44871 100644
--- a/tests/auto/testlib/selftests/expected_skip.lightxml
+++ b/tests/auto/testlib/selftests/expected_skip.lightxml
@@ -4,16 +4,19 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test">
 <Message type="skip" file="tst_skip.cpp" line="68">
     <Description><![CDATA[skipping all]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="emptytest">
 <Message type="skip" file="tst_skip.cpp" line="78">
     <Description><![CDATA[skipping all]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleSkip">
 <Message type="skip" file="tst_skip.cpp" line="97">
@@ -27,7 +30,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[local 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml
index a4e6bc96fe..b220722b6c 100644
--- a/tests/auto/testlib/selftests/expected_skip.xml
+++ b/tests/auto/testlib/selftests/expected_skip.xml
@@ -6,16 +6,19 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test">
 <Message type="skip" file="tst_skip.cpp" line="68">
     <Description><![CDATA[skipping all]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="emptytest">
 <Message type="skip" file="tst_skip.cpp" line="78">
     <Description><![CDATA[skipping all]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleSkip">
 <Message type="skip" file="tst_skip.cpp" line="97">
@@ -29,8 +32,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[local 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml
index 14ce937497..49c9d148f5 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml
@@ -4,12 +4,16 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="aTestFunction">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="skip" file="tst_skipcleanup.cpp" line="59">
     <Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xml b/tests/auto/testlib/selftests/expected_skipcleanup.xml
index 77a02a7d65..0bf1fe53a3 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.xml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.xml
@@ -6,13 +6,17 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="aTestFunction">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="skip" file="tst_skipcleanup.cpp" line="59">
     <Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_skipinit.lightxml b/tests/auto/testlib/selftests/expected_skipinit.lightxml
index 4150838d2f..e06c745205 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.lightxml
@@ -6,7 +6,10 @@
 <Message type="skip" file="tst_skipinit.cpp" line="55">
     <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml
index d9a595192e..6a62b93614 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.xml
+++ b/tests/auto/testlib/selftests/expected_skipinit.xml
@@ -8,8 +8,11 @@
 <Message type="skip" file="tst_skipinit.cpp" line="55">
     <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
index 051292f04b..41abd5dccd 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
@@ -6,4 +6,6 @@
 <Message type="skip" file="tst_skipinitdata.cpp" line="56">
     <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml
index 8c5fbd8fc4..8efe12195e 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml
@@ -8,5 +8,7 @@
 <Message type="skip" file="tst_skipinitdata.cpp" line="56">
     <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_strcmp.lightxml b/tests/auto/testlib/selftests/expected_strcmp.lightxml
index 6ad7e7b997..f0d266d400 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.lightxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.lightxml
@@ -4,9 +4,11 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareCharStars">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareByteArray">
 <Incident type="xfail" file="tst_strcmp.cpp" line="88">
@@ -23,6 +25,7 @@
    Actual   (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ...
    Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ...]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArray">
 <Incident type="fail" file="tst_strcmp.cpp" line="115">
@@ -30,6 +33,7 @@
    Actual   (QByteArray("abc")): 61 62 63
    Expected (QByteArray("cba")): 63 62 61]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArrayNull">
 <Incident type="fail" file="tst_strcmp.cpp" line="121">
@@ -37,6 +41,7 @@
    Actual   (QByteArray("foo")): 66 6F 6F
    Expected (QByteArray())     : ]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArrayEmpty">
 <Incident type="fail" file="tst_strcmp.cpp" line="126">
@@ -44,6 +49,7 @@
    Actual   (QByteArray(""))   : 
    Expected (QByteArray("foo")): 66 6F 6F]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArraySingleChars">
 <Incident type="fail" file="tst_strcmp.cpp" line="133">
@@ -51,7 +57,10 @@
    Actual   (QByteArray("6")): 36
    Expected (QByteArray("7")): 37]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml
index 72ecd4277a..20ffee0611 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.xml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xml
@@ -6,9 +6,11 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareCharStars">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="compareByteArray">
 <Incident type="xfail" file="tst_strcmp.cpp" line="88">
@@ -25,6 +27,7 @@
    Actual   (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ...
    Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ...]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArray">
 <Incident type="fail" file="tst_strcmp.cpp" line="115">
@@ -32,6 +35,7 @@
    Actual   (QByteArray("abc")): 61 62 63
    Expected (QByteArray("cba")): 63 62 61]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArrayNull">
 <Incident type="fail" file="tst_strcmp.cpp" line="121">
@@ -39,6 +43,7 @@
    Actual   (QByteArray("foo")): 66 6F 6F
    Expected (QByteArray())     : ]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArrayEmpty">
 <Incident type="fail" file="tst_strcmp.cpp" line="126">
@@ -46,6 +51,7 @@
    Actual   (QByteArray(""))   : 
    Expected (QByteArray("foo")): 66 6F 6F]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArraySingleChars">
 <Incident type="fail" file="tst_strcmp.cpp" line="133">
@@ -53,8 +59,11 @@
    Actual   (QByteArray("6")): 36
    Expected (QByteArray("7")): 37]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_subtest.lightxml b/tests/auto/testlib/selftests/expected_subtest.lightxml
index 40a14663ba..90cfacbe0b 100644
--- a/tests/auto/testlib/selftests/expected_subtest.lightxml
+++ b/tests/auto/testlib/selftests/expected_subtest.lightxml
@@ -7,6 +7,7 @@
     <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test1">
 <Message type="qdebug" file="" line="0">
@@ -19,6 +20,7 @@
     <Description><![CDATA[cleanup test1 (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test2">
 <Message type="qdebug" file="" line="0">
@@ -84,6 +86,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test3">
 <Message type="qdebug" file="" line="0">
@@ -147,10 +150,13 @@
     <DataTag><![CDATA[data2]]></DataTag>
     <Description><![CDATA[cleanup test3 data2]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
     <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml
index 58fda7222e..cda4df01f3 100644
--- a/tests/auto/testlib/selftests/expected_subtest.xml
+++ b/tests/auto/testlib/selftests/expected_subtest.xml
@@ -9,6 +9,7 @@
     <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test1">
 <Message type="qdebug" file="" line="0">
@@ -21,6 +22,7 @@
     <Description><![CDATA[cleanup test1 (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test2">
 <Message type="qdebug" file="" line="0">
@@ -86,6 +88,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test3">
 <Message type="qdebug" file="" line="0">
@@ -149,11 +152,14 @@
     <DataTag><![CDATA[data2]]></DataTag>
     <Description><![CDATA[cleanup test3 data2]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
     <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.lightxml b/tests/auto/testlib/selftests/expected_verbose1.lightxml
index 3daa1231fe..45dca139fa 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.lightxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassPass">
 <Incident type="pass" file="" line="0">
@@ -12,6 +13,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassSkip">
 <Incident type="pass" file="" line="0">
@@ -21,6 +23,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
 <Incident type="pass" file="" line="0">
@@ -30,6 +33,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -39,6 +43,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -49,6 +54,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -59,6 +65,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailPass">
 <Incident type="fail" file="../counting/tst_counting.cpp" line="115">
@@ -68,6 +75,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailSkip">
 <Incident type="fail" file="../counting/tst_counting.cpp" line="115">
@@ -78,6 +86,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
 <Incident type="fail" file="../counting/tst_counting.cpp" line="115">
@@ -88,6 +97,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInInit">
 <Incident type="pass" file="" line="0">
@@ -100,6 +110,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInCleanup">
 <Incident type="pass" file="" line="0">
@@ -116,6 +127,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInInit">
 <Incident type="pass" file="" line="0">
@@ -128,6 +140,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInCleanup">
 <Incident type="pass" file="" line="0">
@@ -144,7 +157,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.xml b/tests/auto/testlib/selftests/expected_verbose1.xml
index 7da3b42130..7a182183c1 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.xml
+++ b/tests/auto/testlib/selftests/expected_verbose1.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassPass">
 <Incident type="pass" file="" line="0">
@@ -14,6 +15,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassSkip">
 <Incident type="pass" file="" line="0">
@@ -23,6 +25,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
 <Incident type="pass" file="" line="0">
@@ -32,6 +35,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -41,6 +45,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -51,6 +56,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -61,6 +67,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailPass">
 <Incident type="fail" file="../counting/tst_counting.cpp" line="115">
@@ -70,6 +77,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailSkip">
 <Incident type="fail" file="../counting/tst_counting.cpp" line="115">
@@ -80,6 +88,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
 <Incident type="fail" file="../counting/tst_counting.cpp" line="115">
@@ -90,6 +99,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInInit">
 <Incident type="pass" file="" line="0">
@@ -102,6 +112,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInCleanup">
 <Incident type="pass" file="" line="0">
@@ -118,6 +129,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInInit">
 <Incident type="pass" file="" line="0">
@@ -130,6 +142,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInCleanup">
 <Incident type="pass" file="" line="0">
@@ -146,8 +159,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.lightxml b/tests/auto/testlib/selftests/expected_verbose2.lightxml
index 44b79fd8ba..0ead76884c 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.lightxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassPass">
 <Message type="info" file="../counting/tst_counting.cpp" line="111">
@@ -28,6 +29,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassSkip">
 <Message type="info" file="../counting/tst_counting.cpp" line="111">
@@ -45,6 +47,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
 <Message type="info" file="../counting/tst_counting.cpp" line="111">
@@ -66,6 +69,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -83,6 +87,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -93,6 +98,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -107,6 +113,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailPass">
 <Message type="info" file="../counting/tst_counting.cpp" line="115">
@@ -128,6 +135,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailSkip">
 <Message type="info" file="../counting/tst_counting.cpp" line="115">
@@ -142,6 +150,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
 <Message type="info" file="../counting/tst_counting.cpp" line="115">
@@ -160,6 +169,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInInit">
 <Incident type="pass" file="" line="0">
@@ -172,6 +182,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInCleanup">
 <Incident type="pass" file="" line="0">
@@ -188,6 +199,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInInit">
 <Incident type="pass" file="" line="0">
@@ -200,6 +212,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInCleanup">
 <Incident type="pass" file="" line="0">
@@ -216,7 +229,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.xml b/tests/auto/testlib/selftests/expected_verbose2.xml
index 542372327c..6d592f4a52 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.xml
+++ b/tests/auto/testlib/selftests/expected_verbose2.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassPass">
 <Message type="info" file="../counting/tst_counting.cpp" line="111">
@@ -30,6 +31,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassSkip">
 <Message type="info" file="../counting/tst_counting.cpp" line="111">
@@ -47,6 +49,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
 <Message type="info" file="../counting/tst_counting.cpp" line="111">
@@ -68,6 +71,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -85,6 +89,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -95,6 +100,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
 <Message type="skip" file="../counting/tst_counting.cpp" line="118">
@@ -109,6 +115,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailPass">
 <Message type="info" file="../counting/tst_counting.cpp" line="115">
@@ -130,6 +137,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailSkip">
 <Message type="info" file="../counting/tst_counting.cpp" line="115">
@@ -144,6 +152,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
 <Message type="info" file="../counting/tst_counting.cpp" line="115">
@@ -162,6 +171,7 @@
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInInit">
 <Incident type="pass" file="" line="0">
@@ -174,6 +184,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInCleanup">
 <Incident type="pass" file="" line="0">
@@ -190,6 +201,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInInit">
 <Incident type="pass" file="" line="0">
@@ -202,6 +214,7 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipInCleanup">
 <Incident type="pass" file="" line="0">
@@ -218,8 +231,11 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml
index 3118eb628e..fb8f61503e 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml
@@ -4,46 +4,58 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectStdTypes">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectStdExceptions">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectMyExceptions">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInt">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128">
     <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailStdString">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133">
     <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailStdRuntimeError">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailMyException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143">
     <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailMyDerivedException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailNoException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153">
     <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
index a533934d4b..a89528cfb8 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml
@@ -6,47 +6,59 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectStdTypes">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectStdExceptions">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testCorrectMyExceptions">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailInt">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128">
     <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailStdString">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133">
     <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailStdRuntimeError">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailMyException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143">
     <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailMyDerivedException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148">
     <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailNoException">
 <Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153">
     <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml
index 2ad9e97449..bbc96b7010 100644
--- a/tests/auto/testlib/selftests/expected_warnings.lightxml
+++ b/tests/auto/testlib/selftests/expected_warnings.lightxml
@@ -4,6 +4,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testWarnings">
 <Message type="qwarn" file="" line="0">
@@ -31,6 +32,7 @@
     <Description><![CDATA[Babablabla]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testMissingWarnings">
 <Message type="info" file="" line="0">
@@ -42,6 +44,7 @@
 <Incident type="fail" file="" line="0">
     <Description><![CDATA[Not all expected messages were received]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testMissingWarningsRegularExpression">
 <Message type="info" file="" line="0">
@@ -50,6 +53,7 @@
 <Incident type="fail" file="" line="0">
     <Description><![CDATA[Not all expected messages were received]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testMissingWarningsWithData">
 <Message type="info" file="" line="0">
@@ -76,7 +80,10 @@
     <DataTag><![CDATA[second row]]></DataTag>
     <Description><![CDATA[Not all expected messages were received]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml
index 14a45ca4fd..acb80e4f2a 100644
--- a/tests/auto/testlib/selftests/expected_warnings.xml
+++ b/tests/auto/testlib/selftests/expected_warnings.xml
@@ -6,6 +6,7 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testWarnings">
 <Message type="qwarn" file="" line="0">
@@ -33,6 +34,7 @@
     <Description><![CDATA[Babablabla]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testMissingWarnings">
 <Message type="info" file="" line="0">
@@ -44,6 +46,7 @@
 <Incident type="fail" file="" line="0">
     <Description><![CDATA[Not all expected messages were received]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testMissingWarningsRegularExpression">
 <Message type="info" file="" line="0">
@@ -52,6 +55,7 @@
 <Incident type="fail" file="" line="0">
     <Description><![CDATA[Not all expected messages were received]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testMissingWarningsWithData">
 <Message type="info" file="" line="0">
@@ -78,8 +82,11 @@
     <DataTag><![CDATA[second row]]></DataTag>
     <Description><![CDATA[Not all expected messages were received]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/expected_xunit.lightxml b/tests/auto/testlib/selftests/expected_xunit.lightxml
index b9194ce41f..6660cf4e7a 100644
--- a/tests/auto/testlib/selftests/expected_xunit.lightxml
+++ b/tests/auto/testlib/selftests/expected_xunit.lightxml
@@ -4,12 +4,14 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc1">
 <Message type="warn" file="tst_xunit.cpp" line="67">
     <Description><![CDATA[just a QWARN() !]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc2">
 <Message type="qdebug" file="" line="0">
@@ -20,34 +22,42 @@
    Actual   (2): 2
    Expected (3): 3]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc3">
 <Message type="skip" file="tst_xunit.cpp" line="79">
     <Description><![CDATA[skipping this function!]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc4">
 <Incident type="fail" file="tst_xunit.cpp" line="84">
     <Description><![CDATA[a forced failure!]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc5">
 <Incident type="xfail" file="tst_xunit.cpp" line="98">
     <Description><![CDATA[this failure is expected]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc6">
 <Incident type="xfail" file="tst_xunit.cpp" line="104">
     <Description><![CDATA[this failure is also expected]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc7">
 <Incident type="xpass" file="tst_xunit.cpp" line="110">
     <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_xunit.xml b/tests/auto/testlib/selftests/expected_xunit.xml
index 948023e32c..af9fe1f502 100644
--- a/tests/auto/testlib/selftests/expected_xunit.xml
+++ b/tests/auto/testlib/selftests/expected_xunit.xml
@@ -6,12 +6,14 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc1">
 <Message type="warn" file="tst_xunit.cpp" line="67">
     <Description><![CDATA[just a QWARN() !]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc2">
 <Message type="qdebug" file="" line="0">
@@ -22,35 +24,43 @@
    Actual   (2): 2
    Expected (3): 3]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc3">
 <Message type="skip" file="tst_xunit.cpp" line="79">
     <Description><![CDATA[skipping this function!]]></Description>
 </Message>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc4">
 <Incident type="fail" file="tst_xunit.cpp" line="84">
     <Description><![CDATA[a forced failure!]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc5">
 <Incident type="xfail" file="tst_xunit.cpp" line="98">
     <Description><![CDATA[this failure is expected]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc6">
 <Incident type="xfail" file="tst_xunit.cpp" line="104">
     <Description><![CDATA[this failure is also expected]]></Description>
 </Incident>
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFunc7">
 <Incident type="xpass" file="tst_xunit.cpp" line="110">
     <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
 </Incident>
+<Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Incident type="pass" file="" line="0" />
+<Duration msecs="0"/>
 </TestFunction>
+<Duration msecs="0"/>
 </TestCase>
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 15aec85bdf..97083d8d61 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -68,6 +68,7 @@ private:
     QList<LoggerSet> allLoggerSets() const;
 
     QTemporaryDir tempDir;
+    QRegularExpression durationRegExp;
 };
 
 struct BenchmarkResult
@@ -301,6 +302,7 @@ QList<LoggerSet> tst_Selftests::allLoggerSets() const
 
 tst_Selftests::tst_Selftests()
     : tempDir(QDir::tempPath() + "/tst_selftests.XXXXXX")
+    , durationRegExp("<Duration msecs=\"[\\d\\.]+\"/>")
 {}
 
 void tst_Selftests::initTestCase()
@@ -714,6 +716,10 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge
                 QVERIFY2(error.isEmpty(), qPrintable(QString("Expected line didn't parse as benchmark result: %1\nLine: %2").arg(error).arg(expected)));
 
                 QCOMPARE(actualResult, expectedResult);
+            } else if (line.startsWith("    <Duration msecs=") || line.startsWith("<Duration msecs=")) {
+                QRegularExpressionMatch match = durationRegExp.match(line);
+                QVERIFY2(match.hasMatch(), qPrintable(QString::fromLatin1("Invalid Duration tag at line %1 (%2): '%3'")
+                                                      .arg(i).arg(loggers.at(n), output)));
             } else {
                 QVERIFY2(output == expected,
                          qPrintable(QString::fromLatin1("Mismatch at line %1 (%2): '%3' != '%4'")
-- 
cgit v1.2.3