Make Skip an incident in test logging

Skip ends the test (albeit inconclusively).  Rearrange the enums in
the abstract logger, move code to handle skip between relevant
function and tidy up various things that became simpler as a result.

Also reorder the message enum, and its switches, to separate testlib's
internals from the usual Qt messages, and put each group in ascending
order of severity.

Task-number: QTBUG-96844
Change-Id: I2c7a634b9f849830d64eafa750155e66e244b729
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

src/testlib/qabstracttestlogger.cpp

@@ -83,6 +83,7 @@ QT_BEGIN_NAMESPACE
     \value XPass A check which was expected to fail actually passed. This is
            counted as a failure, as it means whatever caused the known failure
            no longer does, so the test needs an update.
+    \value Skip The current test ended prematurely, skipping some checks.
     \value BlacklistedPass As Pass but the test was blacklisted.
     \value BlacklistedXFail As XFail but the test was blacklisted.
     \value BlacklistedFail As Fail but the test was blacklisted.
@@ -122,7 +123,6 @@ QT_BEGIN_NAMESPACE
     \value QCritical A critical error from qCritical().
     \value QFatal A fatal error from qFatal(), or an unrecognised message from
            the Qt logging functions.
-    \value Skip The current test ended prematurely, skipping some checks.
     \value Info Messages QtTest generates as requested by the \c{-v1} or \c{-v2}
            command-line option being specified when running the test.
     \value Warn A warning generated internally by QtTest
@@ -131,7 +131,9 @@ QT_BEGIN_NAMESPACE
     functions to facilitate testing - such as \l QSignalSpy, \l
     QTestAccessibility, \l QTest::qExtractTestData(), and the facilities to
     deliver artificial mouse and keyboard events - are treated as test code,
-    rather than internal to QtTest.
+    rather than internal to QtTest; they call \l qWarning() and friends rather
+    than using the internal logging infrastructure, so that \l
+    QTest::ignoreMessage() can be used to anticipate the messages.
 
     \sa QAbstractTestLogger::addMessage()
 */
@@ -308,19 +310,21 @@ void QAbstractTestLogger::stopLogging()
 /*!
     \fn void QAbstractTestLogger::addIncident(IncidentTypes type, const char *description, const char *file, int line)
 
-    This virtual method is called when an event occurs that relates to whether
+    This virtual method is called when an event occurs that relates to the
-    the test passes or fails. The \a type indicates whether this was a pass or a
+    resolution of the test. The \a type indicates whether this was a pass, a
-    fail, whether a failure was expected, and whether the test being run is
+    fail or a skip, whether a failure was expected, and whether the test being
-    blacklisted. The \a description may be empty (for a pass), a message
+    run is blacklisted. The \a description may be empty (for a pass) or a
-    describing the failure or, for an expected failure, the explanation of why a
+    message describing the nature of the incident. Where the location in code of
-    failure was expected. Where the location in code of the incident is known,
+    the incident is known, it is indicated by \a file and \a line; otherwise,
-    it is indicated by \a file and \a line; otherwise, these are \a nullptr and
+    these are \a nullptr and 0, respectively.
-    0, respectively.
 
     Every logging implementation must implement this method. Note that there are
     circumstances where more than one incident may be reported, in this way, for
     a single run of a test on a single dataset. It is the implementation's
-    responsibility to recognize such cases and decide what to do about them.
+    responsibility to recognize such cases and decide what to do about them. For
+    purposes of counting resolutions of tests in the "Totals" report at the end
+    of a test run, QtTest considers the first incident (excluding XFail and its
+    blacklisted variant) decisive.
 
     \sa addMessage(), addBenchmarkResult()
 */
@@ -340,17 +344,17 @@ void QAbstractTestLogger::stopLogging()
     \fn void QAbstractTestLogger::addMessage(MessageTypes type, const QString &message, const char *file, int line)
 
     This virtual method is called, via its \c QtMsgType overload, from the
-    custom message handler QtTest installs. It is also used by the
+    custom message handler QtTest installs. It is also used to
-    implementations of QSKIP(), to warn about various situations detected by
+    warn about various situations detected by QtTest itself, such
-    QtTest itself, such as \e failure to see a message anticipated by
+    as \e failure to see a message anticipated by QTest::ignoreMessage() and,
-    QTest::ignoreMessage() and, particularly when verbosity options have been
+    particularly when verbosity options have been enabled via the command-line,
-    enabled via the command-line, to log some extra information.
+    to log some extra information.
 
     Every logging implementation must implement this method. The \a type
     indicates the category of message and the \a message is the content to be
     reported. When the message is associated with specific code, the name of the
-    \a file and \a line number within it are also supplied (otherwise, these are
+    \a file and \a line number within it are also supplied; otherwise, these are
-    \nullptr and 0, respectively).
+    \nullptr and 0, respectively.
 
     \sa QTest::ignoreMessage(), addIncident()
 */

src/testlib/qabstracttestlogger_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -65,6 +65,7 @@ class Q_TESTLIB_EXPORT QAbstractTestLogger
 {
 public:
     enum IncidentTypes {
+        Skip,
         Pass,
         XFail,
         Fail,
@@ -76,14 +77,14 @@ public:
     };
 
     enum MessageTypes {
-        Warn,
-        QWarning,
         QDebug,
+        QInfo,
+        QWarning,
         QCritical,
         QFatal,
-        Skip,
+        // testlib's internal messages:
         Info,
-        QInfo
+        Warn
     };
 
     QAbstractTestLogger(const char *filename);

src/testlib/qappletestlogger.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -103,6 +103,8 @@ void QAppleTestLogger::addIncident(IncidentTypes type, const char *description,
 {
     MessageData messageData = [=]() {
         switch (type) {
+        case QAbstractTestLogger::Skip:
+            return MessageData{QtInfoMsg, "skip"};
         case QAbstractTestLogger::Pass:
             return MessageData{QtInfoMsg, "pass"};
         case QAbstractTestLogger::XFail:
@@ -153,8 +155,6 @@ void QAppleTestLogger::addMessage(MessageTypes type, const QString &message, con
             return MessageData{QtWarningMsg, "critical"};
         case QAbstractTestLogger::QFatal:
             return MessageData{QtFatalMsg, nullptr};
-        case QAbstractTestLogger::Skip:
-            return MessageData{QtInfoMsg, "skip"};
         case QAbstractTestLogger::Info:
         case QAbstractTestLogger::QInfo:
             return MessageData{QtInfoMsg, nullptr};
@@ -166,16 +166,8 @@ void QAppleTestLogger::addMessage(MessageTypes type, const QString &message, con
     messageData.generateCategory(&category);
 
     QMessageLogContext context(file, line, /* function = */ nullptr, category.data());
-    QString msg = message;
 
-    if (type == Skip) {
+    AppleUnifiedLogger::messageHandler(messageData.messageType, context, message, subsystem());
-        if (!message.isNull())
-            msg.prepend(testIdentifier() + QLatin1Char('\n'));
-        else
-            msg = testIdentifier();
-    }
-
-    AppleUnifiedLogger::messageHandler(messageData.messageType, context, msg, subsystem());
 }
 
 QString QAppleTestLogger::subsystem() const

src/testlib/qjunittestlogger.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -238,6 +238,10 @@ void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description,
         // Since XFAIL does not add a failure to the testlog in JUnit XML we add a
         // message, so we still have some information about the expected failure.
         addMessage(QAbstractTestLogger::Info, QString::fromUtf8(description), file, line);
+    } else if (type == QAbstractTestLogger::Skip) {
+        auto skippedElement = new QTestElement(QTest::LET_Skipped);
+        skippedElement->addAttribute(QTest::AI_Message, description);
+        currentTestCase->addChild(skippedElement);
     }
 }
 
@@ -283,12 +287,7 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
     Q_UNUSED(file);
     Q_UNUSED(line);
 
-    if (type == QAbstractTestLogger::Skip) {
+    if (type == QAbstractTestLogger::QFatal) {
-        auto skippedElement = new QTestElement(QTest::LET_Skipped);
-        skippedElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
-        currentTestCase->addChild(skippedElement);
-        return;
-    } else if (type == QAbstractTestLogger::QFatal) {
         addFailure(QTest::LET_Error, "qfatal", message);
         return;
     }

src/testlib/qplaintestlogger.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -77,6 +77,8 @@ namespace QTest {
     static const char *incidentType2String(QAbstractTestLogger::IncidentTypes type)
     {
         switch (type) {
+        case QAbstractTestLogger::Skip:
+            return "SKIP   ";
         case QAbstractTestLogger::Pass:
             return "PASS   ";
         case QAbstractTestLogger::XFail:
@@ -105,22 +107,20 @@ namespace QTest {
     static const char *messageType2String(QAbstractTestLogger::MessageTypes type)
     {
         switch (type) {
-        case QAbstractTestLogger::Skip:
-            return "SKIP   ";
-        case QAbstractTestLogger::Warn:
-            return "WARNING";
-        case QAbstractTestLogger::QWarning:
-            return "QWARN  ";
         case QAbstractTestLogger::QDebug:
             return "QDEBUG ";
         case QAbstractTestLogger::QInfo:
             return "QINFO  ";
+        case QAbstractTestLogger::QWarning:
+            return "QWARN  ";
         case QAbstractTestLogger::QCritical:
             return "QCRITICAL";
         case QAbstractTestLogger::QFatal:
             return "QFATAL ";
         case QAbstractTestLogger::Info:
             return "INFO   ";
+        case QAbstractTestLogger::Warn:
+            return "WARNING";
         }
         return "??????";
     }

src/testlib/qtaptestlogger.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -121,7 +121,8 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
         return;
     }
 
-    bool ok = type == Pass || type == XPass || type == BlacklistedPass || type == BlacklistedXPass;
+    bool ok = type == Pass || type == BlacklistedPass || type == Skip
+        || type == XPass || type == BlacklistedXPass;
 
     QTestCharBuffer directive;
     if (type == XFail || type == XPass || type == BlacklistedFail || type == BlacklistedPass
@@ -129,6 +130,8 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description,
         // We treat expected or blacklisted failures/passes as TODO-failures/passes,
         // which should be treated as soft issues by consumers. Not all do though :/
         QTest::qt_asprintf(&directive, " # TODO %s", description);
+    } else if (type == Skip) {
+        QTest::qt_asprintf(&directive, " # SKIP %s", description);
     }
 
     int testNumber = QTestLog::totalCount();
@@ -246,13 +249,7 @@ void QTapTestLogger::addMessage(MessageTypes type, const QString &message,
 {
     Q_UNUSED(file);
     Q_UNUSED(line);
-
+    Q_UNUSED(type);
-    if (type == Skip) {
-        QTestCharBuffer directive;
-        QTest::qt_asprintf(&directive, " # SKIP %s", message.toUtf8().constData());
-        outputTestLine(/* ok  = */ true, QTestLog::totalCount(), directive);
-        return;
-    }
 
     QTestCharBuffer diagnostics;
     QTest::qt_asprintf(&diagnostics, "# %s\n", qPrintable(message));

src/testlib/qteamcitylogger.cpp

@@ -1,6 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Borgar Ovsthus
+** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2017 Borgar Ovsthus
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -54,6 +55,8 @@ namespace QTest {
     static const char *incidentType2String(QAbstractTestLogger::IncidentTypes type)
     {
         switch (type) {
+        case QAbstractTestLogger::Skip:
+            return "SKIP";
         case QAbstractTestLogger::Pass:
             return "PASS";
         case QAbstractTestLogger::XFail:
@@ -77,22 +80,20 @@ namespace QTest {
     static const char *messageType2String(QAbstractTestLogger::MessageTypes type)
     {
         switch (type) {
-        case QAbstractTestLogger::Skip:
-            return "SKIP";
-        case QAbstractTestLogger::Warn:
-            return "WARNING";
-        case QAbstractTestLogger::QWarning:
-            return "QWARN";
         case QAbstractTestLogger::QDebug:
             return "QDEBUG";
         case QAbstractTestLogger::QInfo:
             return "QINFO";
+        case QAbstractTestLogger::QWarning:
+            return "QWARN";
         case QAbstractTestLogger::QCritical:
             return "QCRITICAL";
         case QAbstractTestLogger::QFatal:
             return "QFATAL";
         case QAbstractTestLogger::Info:
             return "INFO";
+        case QAbstractTestLogger::Warn:
+            return "WARNING";
         }
         return "??????";
     }
@@ -172,6 +173,14 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description,
                              detailedText,
                              flowID);
 
+        outputString(qPrintable(buf));
+    } else if (type == QAbstractTestLogger::Skip) {
+        if (file)
+            detailedText.append(QLatin1String(" |[Loc: %1(%2)|]").arg(QString::fromUtf8(file)).arg(line));
+
+        buf = QLatin1String("##teamcity[testIgnored name='%1' message='%2' flowId='%3']\n")
+                .arg(escapedTestFuncName(), detailedText, flowID);
+
         outputString(qPrintable(buf));
     }
 
@@ -201,22 +210,8 @@ void QTeamCityLogger::addMessage(MessageTypes type, const QString &message,
         return;
 
     QString escapedMessage = tcEscapedString(message);
-
-    QString buf;
-
-    if (type == QAbstractTestLogger::Skip) {
-        if (file)
-            escapedMessage.append(QString(QLatin1String(" |[Loc: %1(%2)|]")).arg(QString::fromUtf8(file)).arg(line));
-
-        buf = QString(QLatin1String("##teamcity[testIgnored name='%1' message='%2' flowId='%3']\n"))
-                .arg(escapedTestFuncName(), escapedMessage, flowID);
-
-        outputString(qPrintable(buf));
-    }
-    else {
     addPendingMessage(QTest::messageType2String(type), escapedMessage, file, line);
 }
-}
 
 QString QTeamCityLogger::tcEscapedString(const QString &str) const
 {

src/testlib/qtestlog.cpp

@@ -440,7 +440,7 @@ void QTestLog::addSkip(const char *msg, const char *file, int line)
     ++QTest::skips;
 
     FOREACH_TEST_LOGGER
-        logger->addMessage(QAbstractTestLogger::Skip, QString::fromUtf8(msg), file, line);
+        logger->addIncident(QAbstractTestLogger::Skip, msg, file, line);
 }
 
 void QTestLog::addBenchmarkResult(const QBenchmarkResult &result)

src/testlib/qxmltestlogger.cpp

@@ -56,22 +56,20 @@ namespace QTest {
     static const char *xmlMessageType2String(QAbstractTestLogger::MessageTypes type)
     {
         switch (type) {
-        case QAbstractTestLogger::Warn:
-            return "warn";
-        case QAbstractTestLogger::QCritical:
-            return "qcritical";
         case QAbstractTestLogger::QDebug:
             return "qdebug";
         case QAbstractTestLogger::QInfo:
             return "qinfo";
         case QAbstractTestLogger::QWarning:
             return "qwarn";
+        case QAbstractTestLogger::QCritical:
+            return "qcritical";
         case QAbstractTestLogger::QFatal:
             return "qfatal";
-        case QAbstractTestLogger::Skip:
-            return "skip";
         case QAbstractTestLogger::Info:
             return "info";
+        case QAbstractTestLogger::Warn:
+            return "warn";
         }
         return "??????";
     }
@@ -79,6 +77,8 @@ namespace QTest {
     static const char *xmlIncidentType2String(QAbstractTestLogger::IncidentTypes type)
     {
         switch (type) {
+        case QAbstractTestLogger::Skip:
+            return "skip";
         case QAbstractTestLogger::Pass:
             return "pass";
         case QAbstractTestLogger::XFail:

tests/auto/testlib/selftests/expected_benchlibcounting.lightxml

@@ -13,9 +13,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skippingBenchmark">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0">
     <Description><![CDATA[This is a skipping benchmark]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failingBenchmark">

tests/auto/testlib/selftests/expected_benchlibcounting.xml

@@ -15,9 +15,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skippingBenchmark">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0">
     <Description><![CDATA[This is a skipping benchmark]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failingBenchmark">

tests/auto/testlib/selftests/expected_benchlibtickcounter.csv

@@ -1 +1 @@
-"threeBillionTicks","","CPUTicks",3000071247,3000071247,1
+"threeBillionTicks","","CPUTicks",3000023453,3000023453,1

tests/auto/testlib/selftests/expected_blacklisted.lightxml

@@ -15,9 +15,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This test should SKIP]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fail">
@@ -37,9 +37,9 @@
 <Incident type="bxfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This test should BXFAIL then SKIP]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This skip should be seen and counted]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailContinueFail">
@@ -61,9 +61,9 @@
 <Incident type="bxpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA['true' returned TRUE unexpectedly. (This test should BXPASS then SKIP)]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This skip should be seen but not counted]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassContinueFail">

tests/auto/testlib/selftests/expected_blacklisted.teamcity

@@ -4,7 +4,9 @@
 ##teamcity[testStarted name='pass()' flowId='tst_Blacklisted']
 ##teamcity[testStdOut name='pass()' out='QDEBUG: This test should BPASS' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='pass()' flowId='tst_Blacklisted']
+##teamcity[testStarted name='skip()' flowId='tst_Blacklisted']
 ##teamcity[testIgnored name='skip()' message='This test should SKIP |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted']
+##teamcity[testFinished name='skip()' flowId='tst_Blacklisted']
 ##teamcity[testStarted name='fail()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='fail()' flowId='tst_Blacklisted']
 ##teamcity[testStarted name='xfail()' flowId='tst_Blacklisted']
@@ -13,6 +15,7 @@
 ##teamcity[testStarted name='xfailContinueSkip()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xfailContinueSkip()' flowId='tst_Blacklisted']
 ##teamcity[testIgnored name='xfailContinueSkip()' message='This skip should be seen and counted |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted']
+##teamcity[testFinished name='xfailContinueSkip()' flowId='tst_Blacklisted']
 ##teamcity[testStarted name='xfailContinueFail()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xfailContinueFail()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xfailContinueFail()' flowId='tst_Blacklisted']
@@ -21,6 +24,7 @@
 ##teamcity[testStarted name='xpassContinueSkip()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_Blacklisted']
 ##teamcity[testIgnored name='xpassContinueSkip()' message='This skip should be seen but not counted |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted']
+##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_Blacklisted']
 ##teamcity[testStarted name='xpassContinueFail()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xpassContinueFail()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xpassContinueFail()' flowId='tst_Blacklisted']

tests/auto/testlib/selftests/expected_blacklisted.xml

@@ -17,9 +17,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This test should SKIP]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="fail">
@@ -39,9 +39,9 @@
 <Incident type="bxfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This test should BXFAIL then SKIP]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This skip should be seen and counted]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailContinueFail">
@@ -63,9 +63,9 @@
 <Incident type="bxpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA['true' returned TRUE unexpectedly. (This test should BXPASS then SKIP)]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
     <Description><![CDATA[This skip should be seen but not counted]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassContinueFail">

tests/auto/testlib/selftests/expected_counting.lightxml

@@ -20,10 +20,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
@@ -37,31 +37,31 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
@@ -83,10 +83,10 @@
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
@@ -134,10 +134,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[before]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in init()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
@@ -151,10 +151,10 @@
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in cleanup()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>

tests/auto/testlib/selftests/expected_counting.teamcity

@@ -7,18 +7,28 @@
 ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting']
 ##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting']
 ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting']
@@ -30,7 +40,9 @@
 ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting']
 ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting']
@@ -54,14 +66,18 @@
 ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipInInit(skip)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipInInit(skip)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipInCleanup(skip)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting']
-##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Counting']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Counting']

tests/auto/testlib/selftests/expected_counting.xml

@@ -22,10 +22,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
@@ -39,31 +39,31 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
@@ -85,10 +85,10 @@
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
@@ -136,10 +136,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[before]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in init()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
@@ -153,10 +153,10 @@
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in cleanup()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>

tests/auto/testlib/selftests/expected_expectfail.lightxml

@@ -34,9 +34,9 @@
 <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA[This should xfail then skip]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA[This skip should be reported and counted]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailAbortSkip">
@@ -82,14 +82,14 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQString">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Pass Abort]]></DataTag>
     <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Pass Continue]]></DataTag>
     <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description>
-</Message>
+</Incident>
 <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Fail Abort]]></DataTag>
     <Description><![CDATA[A string]]></Description>
@@ -105,10 +105,10 @@
     <DataTag><![CDATA[Fail Continue]]></DataTag>
     <Description><![CDATA[Bug 5 (The message)]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Fail Continue]]></DataTag>
     <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQVerify">
@@ -241,9 +241,9 @@
 <Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA[This should be reached but not increment skip-count]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassContinueXfailAbort">

tests/auto/testlib/selftests/expected_expectfail.teamcity

@@ -9,8 +9,10 @@
 ##teamcity[testFinished name='xfailAndAbort()' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailContinueSkip()' flowId='tst_ExpectFail']
 ##teamcity[testIgnored name='xfailContinueSkip()' message='This skip should be reported and counted |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail']
+##teamcity[testStdOut name='xfailContinueSkip()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail then skip' flowId='tst_ExpectFail']
+##teamcity[testFinished name='xfailContinueSkip()' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailAbortSkip()' flowId='tst_ExpectFail']
-##teamcity[testStdOut name='xfailAbortSkip()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail then skip|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail' flowId='tst_ExpectFail']
+##teamcity[testStdOut name='xfailAbortSkip()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xfailAbortSkip()' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailTwice()' flowId='tst_ExpectFail']
 ##teamcity[testFailed name='xfailTwice()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='Already expecting a fail' flowId='tst_ExpectFail']
@@ -30,15 +32,20 @@
 ##teamcity[testStarted name='xfailWithQString()' flowId='tst_ExpectFail']
 ##teamcity[testStdOut name='xfailWithQString()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xfailWithQString()' flowId='tst_ExpectFail']
+##teamcity[testStarted name='xfailDataDrivenWithQString(Pass Abort)' flowId='tst_ExpectFail']
 ##teamcity[testIgnored name='xfailDataDrivenWithQString(Pass Abort)' message='Each Continue or Pass reports this and increments skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail']
+##teamcity[testFinished name='xfailDataDrivenWithQString(Pass Abort)' flowId='tst_ExpectFail']
+##teamcity[testStarted name='xfailDataDrivenWithQString(Pass Continue)' flowId='tst_ExpectFail']
 ##teamcity[testIgnored name='xfailDataDrivenWithQString(Pass Continue)' message='Each Continue or Pass reports this and increments skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail']
+##teamcity[testFinished name='xfailDataDrivenWithQString(Pass Continue)' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailDataDrivenWithQString(Fail Abort)' flowId='tst_ExpectFail']
 ##teamcity[testStdOut name='xfailDataDrivenWithQString(Fail Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xfailDataDrivenWithQString(Fail Abort)' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailDataDrivenWithQString(Fail Continue)' flowId='tst_ExpectFail']
 ##teamcity[testIgnored name='xfailDataDrivenWithQString(Fail Continue)' message='Each Continue or Pass reports this and increments skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail']
+##teamcity[testStdOut name='xfailDataDrivenWithQString(Fail Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail']
+##teamcity[testFinished name='xfailDataDrivenWithQString(Fail Continue)' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass Abort)' flowId='tst_ExpectFail']
-##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Pass Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass Abort)' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass Continue)' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass Continue)' flowId='tst_ExpectFail']
@@ -95,6 +102,7 @@
 ##teamcity[testStdOut name='xpassContinueSkip()' out='QDEBUG: This should be reached' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_ExpectFail']
 ##teamcity[testIgnored name='xpassContinueSkip()' message='This should be reached but not increment skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail']
+##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_ExpectFail']
 ##teamcity[testStarted name='xpassContinueXfailAbort()' flowId='tst_ExpectFail']
 ##teamcity[testFailed name='xpassContinueXfailAbort()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail']
 ##teamcity[testFinished name='xpassContinueXfailAbort()' flowId='tst_ExpectFail']

tests/auto/testlib/selftests/expected_expectfail.xml

@@ -36,9 +36,9 @@
 <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA[This should xfail then skip]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA[This skip should be reported and counted]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailAbortSkip">
@@ -84,14 +84,14 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQString">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Pass Abort]]></DataTag>
     <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Pass Continue]]></DataTag>
     <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description>
-</Message>
+</Incident>
 <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Fail Abort]]></DataTag>
     <Description><![CDATA[A string]]></Description>
@@ -107,10 +107,10 @@
     <DataTag><![CDATA[Fail Continue]]></DataTag>
     <Description><![CDATA[Bug 5 (The message)]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <DataTag><![CDATA[Fail Continue]]></DataTag>
     <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xfailDataDrivenWithQVerify">
@@ -243,9 +243,9 @@
 <Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0">
     <Description><![CDATA[This should be reached but not increment skip-count]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="xpassContinueXfailAbort">

tests/auto/testlib/selftests/expected_globaldata.lightxml

@@ -90,10 +90,10 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
@@ -101,10 +101,10 @@
     <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=false]]></Description>
@@ -113,10 +113,10 @@
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=true]]></Description>
@@ -125,10 +125,10 @@
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=false]]></Description>
@@ -137,10 +137,10 @@
     <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=true]]></Description>
@@ -167,10 +167,10 @@
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[cleanup skipSingle local=true]]></Description>
@@ -179,10 +179,10 @@
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[cleanup skipSingle local=false]]></Description>

tests/auto/testlib/selftests/expected_globaldata.teamcity

@@ -14,18 +14,38 @@
 ##teamcity[testStarted name='testGlobal(local=true)' flowId='tst_globaldata']
 ##teamcity[testStdOut name='testGlobal(local=true)' out='QDEBUG: init testGlobal local=true|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local=true' flowId='tst_globaldata']
 ##teamcity[testFinished name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStarted name='skip()' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skip()' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testFinished name='skip()' flowId='tst_globaldata']
+##teamcity[testStarted name='skipLocal(local=false)' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipLocal(local=false)' out='QDEBUG: init skipLocal local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='skipLocal(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='skipLocal(local=true)' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipLocal(local=true)' out='QDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='skipLocal(local=true)' flowId='tst_globaldata']
+##teamcity[testStarted name='skipLocal(local=false)' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipLocal(local=false)' out='QDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipLocal local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='skipLocal(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='skipLocal(local=true)' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipLocal(local=true)' out='QDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='skipLocal(local=true)' flowId='tst_globaldata']
 ##teamcity[testStarted name='skipSingle(local=false)' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local=false' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local=false' flowId='tst_globaldata']
 ##teamcity[testFinished name='skipSingle(local=false)' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipSingle(local=true)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipSingle(local=false)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
 ##teamcity[testStarted name='skipSingle(local=true)' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=true|nQDEBUG: cleanup skipSingle local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: cleanup skipSingle local=false|nQDEBUG: init skipSingle local=true|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipSingle(local=true)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata']
+##teamcity[testStarted name='skipSingle(local=false)' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipSingle(local=false)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: cleanup skipSingle local=true|nQDEBUG: init skipSingle local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='skipSingle(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: cleanup skipSingle local=false|nQDEBUG: init skipSingle local=true|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata']
 ##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_globaldata']
 ##teamcity[testStdOut name='cleanupTestCase()' out='QDEBUG: cleanupTestCase cleanupTestCase (null)' flowId='tst_globaldata']

tests/auto/testlib/selftests/expected_globaldata.xml

@@ -92,10 +92,10 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
@@ -103,10 +103,10 @@
     <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=false]]></Description>
@@ -115,10 +115,10 @@
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=true]]></Description>
@@ -127,10 +127,10 @@
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=false]]></Description>
@@ -139,10 +139,10 @@
     <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[cleanup skipLocal local=true]]></Description>
@@ -169,10 +169,10 @@
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[cleanup skipSingle local=true]]></Description>
@@ -181,10 +181,10 @@
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[cleanup skipSingle local=false]]></Description>

tests/auto/testlib/selftests/expected_mouse.lightxml

@@ -38,20 +38,20 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="stateHandlingPart2">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
     <Description><![CDATA[Not implemented beyond this point!]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="deterministicEvents">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
     <DataTag><![CDATA[first-run-true]]></DataTag>
     <Description><![CDATA[Not implemented!]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
     <DataTag><![CDATA[first-run-false]]></DataTag>
     <Description><![CDATA[Not implemented!]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">

tests/auto/testlib/selftests/expected_mouse.teamcity

@@ -17,9 +17,15 @@
 ##teamcity[testFinished name='stateHandlingPart1(dummy-1)' flowId='tst_Mouse']
 ##teamcity[testStarted name='stateHandlingPart1(dummy-2)' flowId='tst_Mouse']
 ##teamcity[testFinished name='stateHandlingPart1(dummy-2)' flowId='tst_Mouse']
+##teamcity[testStarted name='stateHandlingPart2()' flowId='tst_Mouse']
 ##teamcity[testIgnored name='stateHandlingPart2()' message='Not implemented beyond this point! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse']
+##teamcity[testFinished name='stateHandlingPart2()' flowId='tst_Mouse']
+##teamcity[testStarted name='deterministicEvents(first-run-true)' flowId='tst_Mouse']
 ##teamcity[testIgnored name='deterministicEvents(first-run-true)' message='Not implemented! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse']
+##teamcity[testFinished name='deterministicEvents(first-run-true)' flowId='tst_Mouse']
+##teamcity[testStarted name='deterministicEvents(first-run-false)' flowId='tst_Mouse']
 ##teamcity[testIgnored name='deterministicEvents(first-run-false)' message='Not implemented! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse']
+##teamcity[testFinished name='deterministicEvents(first-run-false)' flowId='tst_Mouse']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Mouse']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Mouse']
 ##teamcity[testSuiteFinished name='tst_Mouse' flowId='tst_Mouse']

tests/auto/testlib/selftests/expected_mouse.xml

@@ -40,20 +40,20 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="stateHandlingPart2">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
     <Description><![CDATA[Not implemented beyond this point!]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="deterministicEvents">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
     <DataTag><![CDATA[first-run-true]]></DataTag>
     <Description><![CDATA[Not implemented!]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0">
     <DataTag><![CDATA[first-run-false]]></DataTag>
     <Description><![CDATA[Not implemented!]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">

tests/auto/testlib/selftests/expected_silent.txt

@@ -1,4 +1,6 @@
 Testing tst_Silent
+SKIP   : tst_Silent::skip() This test should skip
+   Loc: [qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)]
 FAIL!  : tst_Silent::fail() 'false' returned FALSE. (This test should fail)
    Loc: [qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)]
 XPASS  : tst_Silent::xpass() 'true' returned TRUE unexpectedly. (This test should XPASS)

tests/auto/testlib/selftests/expected_singleskip.lightxml

@@ -8,9 +8,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="myTest">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0">
     <Description><![CDATA[skipping test]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">

tests/auto/testlib/selftests/expected_singleskip.teamcity

@@ -1,7 +1,9 @@
 ##teamcity[testSuiteStarted name='tst_SingleSkip' flowId='tst_SingleSkip']
 ##teamcity[testStarted name='initTestCase()' flowId='tst_SingleSkip']
 ##teamcity[testFinished name='initTestCase()' flowId='tst_SingleSkip']
+##teamcity[testStarted name='myTest()' flowId='tst_SingleSkip']
 ##teamcity[testIgnored name='myTest()' message='skipping test |[Loc: qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(0)|]' flowId='tst_SingleSkip']
+##teamcity[testFinished name='myTest()' flowId='tst_SingleSkip']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SingleSkip']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SingleSkip']
 ##teamcity[testSuiteFinished name='tst_SingleSkip' flowId='tst_SingleSkip']

tests/auto/testlib/selftests/expected_singleskip.xml

@@ -10,9 +10,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="myTest">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0">
     <Description><![CDATA[skipping test]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">

tests/auto/testlib/selftests/expected_skip.lightxml

@@ -8,22 +8,22 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
     <Description><![CDATA[skipping all]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="emptytest">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
     <Description><![CDATA[skipping all]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
     <DataTag><![CDATA[local 1]]></DataTag>
     <Description><![CDATA[skipping one]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[local 2]]></DataTag>
     <Description><![CDATA[this line should only be reached once (true)]]></Description>

tests/auto/testlib/selftests/expected_skip.teamcity

@@ -1,9 +1,15 @@
 ##teamcity[testSuiteStarted name='tst_Skip' flowId='tst_Skip']
 ##teamcity[testStarted name='initTestCase()' flowId='tst_Skip']
 ##teamcity[testFinished name='initTestCase()' flowId='tst_Skip']
+##teamcity[testStarted name='test()' flowId='tst_Skip']
 ##teamcity[testIgnored name='test()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip']
+##teamcity[testFinished name='test()' flowId='tst_Skip']
+##teamcity[testStarted name='emptytest()' flowId='tst_Skip']
 ##teamcity[testIgnored name='emptytest()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip']
+##teamcity[testFinished name='emptytest()' flowId='tst_Skip']
+##teamcity[testStarted name='singleSkip(local 1)' flowId='tst_Skip']
 ##teamcity[testIgnored name='singleSkip(local 1)' message='skipping one |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip']
+##teamcity[testFinished name='singleSkip(local 1)' flowId='tst_Skip']
 ##teamcity[testStarted name='singleSkip(local 2)' flowId='tst_Skip']
 ##teamcity[testStdOut name='singleSkip(local 2)' out='QDEBUG: this line should only be reached once (true)' flowId='tst_Skip']
 ##teamcity[testFinished name='singleSkip(local 2)' flowId='tst_Skip']

tests/auto/testlib/selftests/expected_skip.xml

@@ -10,22 +10,22 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="test">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
     <Description><![CDATA[skipping all]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="emptytest">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
     <Description><![CDATA[skipping all]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="singleSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0">
     <DataTag><![CDATA[local 1]]></DataTag>
     <Description><![CDATA[skipping one]]></Description>
-</Message>
+</Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[local 2]]></DataTag>
     <Description><![CDATA[this line should only be reached once (true)]]></Description>

tests/auto/testlib/selftests/expected_skipcleanup.lightxml

@@ -12,9 +12,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0">
     <Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>

tests/auto/testlib/selftests/expected_skipcleanup.teamcity

@@ -3,5 +3,7 @@
 ##teamcity[testFinished name='initTestCase()' flowId='tst_SkipCleanup']
 ##teamcity[testStarted name='aTestFunction()' flowId='tst_SkipCleanup']
 ##teamcity[testFinished name='aTestFunction()' flowId='tst_SkipCleanup']
+##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipCleanup']
 ##teamcity[testIgnored name='cleanupTestCase()' message='Skip inside cleanupTestCase. |[Loc: qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)|]' flowId='tst_SkipCleanup']
+##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipCleanup']
 ##teamcity[testSuiteFinished name='tst_SkipCleanup' flowId='tst_SkipCleanup']

tests/auto/testlib/selftests/expected_skipcleanup.xml

@@ -14,9 +14,9 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0">
     <Description><![CDATA[Skip inside cleanupTestCase.]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>

tests/auto/testlib/selftests/expected_skipinit.lightxml

@@ -4,9 +4,9 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0">
     <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">

tests/auto/testlib/selftests/expected_skipinit.teamcity

@@ -1,5 +1,7 @@
 ##teamcity[testSuiteStarted name='tst_SkipInit' flowId='tst_SkipInit']
+##teamcity[testStarted name='initTestCase()' flowId='tst_SkipInit']
 ##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase. This should skip all tests in the class. |[Loc: qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(0)|]' flowId='tst_SkipInit']
+##teamcity[testFinished name='initTestCase()' flowId='tst_SkipInit']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipInit']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipInit']
 ##teamcity[testSuiteFinished name='tst_SkipInit' flowId='tst_SkipInit']

tests/auto/testlib/selftests/expected_skipinit.xml

@@ -6,9 +6,9 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0">
     <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="cleanupTestCase">

tests/auto/testlib/selftests/expected_skipinitdata.lightxml

@@ -4,9 +4,9 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0">
     <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>

tests/auto/testlib/selftests/expected_skipinitdata.teamcity

@@ -1,3 +1,5 @@
 ##teamcity[testSuiteStarted name='tst_SkipInitData' flowId='tst_SkipInitData']
+##teamcity[testStarted name='initTestCase()' flowId='tst_SkipInitData']
 ##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase_data. This should skip all tests in the class. |[Loc: qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(0)|]' flowId='tst_SkipInitData']
+##teamcity[testFinished name='initTestCase()' flowId='tst_SkipInitData']
 ##teamcity[testSuiteFinished name='tst_SkipInitData' flowId='tst_SkipInitData']

tests/auto/testlib/selftests/expected_skipinitdata.xml

@@ -6,9 +6,9 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0">
     <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>

tests/auto/testlib/selftests/expected_verbose1.lightxml

@@ -20,10 +20,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
@@ -37,31 +37,31 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
@@ -83,10 +83,10 @@
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
@@ -134,10 +134,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[before]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in init()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
@@ -151,10 +151,10 @@
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in cleanup()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>

tests/auto/testlib/selftests/expected_verbose1.teamcity

@@ -7,18 +7,28 @@
 ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting']
 ##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting']
 ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting']
@@ -30,7 +40,9 @@
 ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting']
 ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting']
@@ -54,14 +66,18 @@
 ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipInInit(skip)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipInInit(skip)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipInCleanup(skip)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting']
-##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Counting']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Counting']

tests/auto/testlib/selftests/expected_verbose1.xml

@@ -22,10 +22,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
@@ -39,31 +39,31 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
@@ -85,10 +85,10 @@
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
@@ -136,10 +136,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[before]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in init()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
@@ -153,10 +153,10 @@
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in cleanup()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>

tests/auto/testlib/selftests/expected_verbose2.lightxml

@@ -44,10 +44,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
@@ -73,10 +73,10 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[QVERIFY(true)]]></Description>
@@ -91,21 +91,21 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[QVERIFY(false)]]></Description>
@@ -147,10 +147,10 @@
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
@@ -206,10 +206,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[before]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in init()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
@@ -223,10 +223,10 @@
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in cleanup()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>

tests/auto/testlib/selftests/expected_verbose2.teamcity

@@ -10,7 +10,9 @@
 ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testStdOut name='testPassSkip(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting']
 ##teamcity[testStdOut name='testPassFail(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting']
@@ -18,13 +20,21 @@
 ##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testStdOut name='testPassFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting']
 ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting']
 ##teamcity[testStdOut name='testSkipPass(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting']
 ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testStdOut name='testSkipFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting']
@@ -40,7 +50,9 @@
 ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testStdOut name='testFailSkip(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting']
 ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting']
+##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting']
 ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting']
 ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting']
 ##teamcity[testStdOut name='testFailFail(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting']
@@ -66,14 +78,18 @@
 ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipInInit(skip)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipInInit(skip)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting']
+##teamcity[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting']
 ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting']
+##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting']
+##teamcity[testFinished name='testSkipInCleanup(skip)' flowId='tst_Counting']
 ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting']
-##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting']
 ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Counting']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Counting']

tests/auto/testlib/selftests/expected_verbose2.xml

@@ -46,10 +46,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testPassFail">
@@ -75,10 +75,10 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipPass">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[QVERIFY(true)]]></Description>
@@ -93,21 +93,21 @@
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipSkip">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testSkipFail">
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
 <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[QVERIFY(false)]]></Description>
@@ -149,10 +149,10 @@
     <DataTag><![CDATA[row 1]]></DataTag>
     <Description><![CDATA['false' returned FALSE. ()]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[row 2]]></DataTag>
     <Description><![CDATA[Skipping]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailFail">
@@ -208,10 +208,10 @@
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[before]]></DataTag>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in init()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>
@@ -225,10 +225,10 @@
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
     <Description><![CDATA[Skip in cleanup()]]></Description>
-</Message>
+</Incident>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[after]]></DataTag>
 </Incident>

tests/auto/testlib/selftests/expected_warnings.lightxml

@@ -192,9 +192,9 @@ Ran out of cabbage!]]></Description>
     <Description><![CDATA[Received a warning that resulted in a failure:
 Ran out of cabbage!]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0">
     <Description><![CDATA[My cabbage! :(]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailOnWarningsAndIgnoreWarnings">

tests/auto/testlib/selftests/expected_warnings.teamcity

@@ -54,6 +54,7 @@
 ##teamcity[testFailed name='testFailOnWarningsThenSkip()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp(0)|]' details='Received a warning that resulted in a failure:|nRan out of cabbage!' flowId='tst_Warnings']
 ##teamcity[testFinished name='testFailOnWarningsThenSkip()' flowId='tst_Warnings']
 ##teamcity[testIgnored name='testFailOnWarningsThenSkip()' message='My cabbage! :( |[Loc: qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp(0)|]' flowId='tst_Warnings']
+##teamcity[testFinished name='testFailOnWarningsThenSkip()' flowId='tst_Warnings']
 ##teamcity[testStarted name='testFailOnWarningsAndIgnoreWarnings()' flowId='tst_Warnings']
 ##teamcity[testFinished name='testFailOnWarningsAndIgnoreWarnings()' flowId='tst_Warnings']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Warnings']

tests/auto/testlib/selftests/expected_warnings.xml

@@ -194,9 +194,9 @@ Ran out of cabbage!]]></Description>
     <Description><![CDATA[Received a warning that resulted in a failure:
 Ran out of cabbage!]]></Description>
 </Incident>
-<Message type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0">
+<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0">
     <Description><![CDATA[My cabbage! :(]]></Description>
-</Message>
+</Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="testFailOnWarningsAndIgnoreWarnings">