1 files changed, 10 insertions, 7 deletions

diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index c5f847562e..008cce6218 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -520,6 +520,7 @@ void tst_Selftests::runSubTest_data()
 
         foreach (QString const& subtest, tests) {
             QStringList arguments = loggerSet.arguments;
+            // Keep in sync with generateTestData()'s extraArgs in generate_expected_output.py:
             if (subtest == "commandlinedata") {
                 arguments << QString("fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2").split(' ');
             }
@@ -612,6 +613,7 @@ void tst_Selftests::runSubTest_data()
             if (loggerSet.name.contains("teamcity") && subtest.startsWith("benchlib"))
                 continue;   // Skip benchmark for TeamCity logger
 
+            // Keep in sync with generateTestData()'s crashers in generate_expected_output.py:
             const bool crashes = subtest == QLatin1String("assert") || subtest == QLatin1String("exceptionthrow")
                 || subtest == QLatin1String("fetchbogus") || subtest == QLatin1String("crashedterminate")
                 || subtest == QLatin1String("crashes") || subtest == QLatin1String("silent")
@@ -687,6 +689,7 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge
 
     QProcess proc;
     QProcessEnvironment environment = processEnvironment();
+    // Keep in sync with generateTestData()'s extraEnv in generate_expected_output.py:
     if (crashes) {
         environment.insert("QTEST_DISABLE_CORE_DUMP", "1");
         environment.insert("QTEST_DISABLE_STACK_DUMP", "1");
@@ -893,16 +896,19 @@ bool tst_Selftests::compareLine(const QString &logger, const QString &subdir,
                                 const QString &actualLine, const QString &expectedLine,
                                 QString *errorMessage) const
 {
-    if (subdir == QLatin1String("assert") && actualLine.contains(QLatin1String("ASSERT: "))
-        && expectedLine.contains(QLatin1String("ASSERT: ")) && actualLine != expectedLine) {
+    if (actualLine == expectedLine)
+        return true;
+
+    if (subdir == QLatin1String("assert")
+        && actualLine.contains(QLatin1String("ASSERT: "))
+        && expectedLine.contains(QLatin1String("ASSERT: "))) {
         // Q_ASSERT uses __FILE__, the exact contents of which are
         // undefined. If have we something that looks like a Q_ASSERT and we
         // were expecting to see a Q_ASSERT, we'll skip the line.
         return true;
     }
 
-    if (expectedLine.startsWith(QLatin1String("FAIL!  : tst_Exception::throwException() Caught unhandled exce"))
-        && actualLine != expectedLine) {
+    if (expectedLine.startsWith(QLatin1String("FAIL!  : tst_Exception::throwException() Caught unhandled exce"))) {
         // On some platforms we compile without RTTI, and as a result we never throw an exception
         if (actualLine.simplified() != QLatin1String("tst_Exception::throwException()")) {
             *errorMessage = QString::fromLatin1("'%1' != 'tst_Exception::throwException()'").arg(actualLine);
@@ -941,9 +947,6 @@ bool tst_Selftests::compareLine(const QString &logger, const QString &subdir,
     if (actualLine.startsWith(QLatin1String("Totals:")) && expectedLine.startsWith(QLatin1String("Totals:")))
         return true;
 
-    if (actualLine == expectedLine)
-        return true;
-
     *errorMessage = msgMismatch(actualLine, expectedLine);
     return false;
 }