1 files changed, 29 insertions, 9 deletions

diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index 85668c96d4..f9553028fe 100644
--- a/tests/auto/tools/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
@@ -37,6 +37,11 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QStandardPaths>
 
+#include <cstdio>
+
+static const char keepEnvVar[] = "UIC_KEEP_GENERATED_FILES";
+static const char diffToStderrEnvVar[] = "UIC_STDERR_DIFF";
+
 class tst_uic : public QObject
 {
     Q_OBJECT
@@ -69,7 +74,7 @@ private:
 
 tst_uic::tst_uic()
     : m_command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic"))
-    , m_versionRegexp(QLatin1String("\\*\\* Created by: Qt User Interface Compiler version \\d{1,2}\\.\\d{1,2}\\.\\d{1,2}"))
+    , m_versionRegexp(QLatin1String(R"(\*\* Created by: Qt User Interface Compiler version \d{1,2}\.\d{1,2}\.\d{1,2})"))
 {
 }
 
@@ -103,14 +108,19 @@ void tst_uic::initTestCase()
     qDebug("%s", qPrintable(msg));
 }
 
+static const char helpFormat[] = R"(
+Note: The environment variable '%s' can be set to keep the temporary files
+for error analysis.
+The environment variable '%s' can be set to redirect the diff output to
+stderr.)";
+
 void tst_uic::cleanupTestCase()
 {
-    static const char envVar[] = "UIC_KEEP_GENERATED_FILES";
-    if (qgetenv(envVar).isEmpty()) {
-        qDebug("Note: The environment variable '%s' can be set to keep the temporary files for error analysis.", envVar);
-    } else {
+    if (qEnvironmentVariableIsSet(keepEnvVar)) {
         m_generated.setAutoRemove(false);
         qDebug("Keeping generated files in '%s'", qPrintable(QDir::toNativeSeparators(m_generated.path())));
+    } else {
+        qDebug(helpFormat, keepEnvVar, diffToStderrEnvVar);
     }
 }
 
@@ -152,7 +162,7 @@ void tst_uic::run()
     QVERIFY(process.waitForFinished());
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
     QCOMPARE(process.exitCode(), 0);
-    QCOMPARE(QFileInfo(generatedFile).exists(), true);
+    QVERIFY(QFileInfo::exists(generatedFile));
 }
 
 void tst_uic::run_data() const
@@ -212,6 +222,16 @@ static QByteArray msgCannotReadFile(const QFile &file)
     return result.toLocal8Bit();
 }
 
+static void outputDiff(const QString &diff)
+{
+    // Use patch -p3 < diff to apply the obtained diff output in the baseline directory.
+    static const bool diffToStderr = qEnvironmentVariableIsSet(diffToStderrEnvVar);
+    if (diffToStderr)
+        std::fputs(qPrintable(diff), stderr);
+    else
+        qWarning("Difference:\n%s", qPrintable(diff));
+}
+
 void tst_uic::compare()
 {
     QFETCH(QString, originalFile);
@@ -233,7 +253,7 @@ void tst_uic::compare()
     if (generatedFileContents != originalFileContents) {
         const QString diff = generateDiff(originalFile, generatedFile);
         if (!diff.isEmpty())
-             qWarning().noquote().nospace() << "Difference:\n" << diff;
+            outputDiff(diff);
     }
 
     QCOMPARE(generatedFileContents, originalFileContents);
@@ -274,7 +294,7 @@ void tst_uic::runTranslation()
     QVERIFY(process.waitForFinished());
     QCOMPARE(process.exitStatus(), QProcess::NormalExit);
     QCOMPARE(process.exitCode(), 0);
-    QCOMPARE(QFileInfo(generatedFile).exists(), true);
+    QVERIFY(QFileInfo::exists(generatedFile));
 }
 
 
@@ -301,7 +321,7 @@ void tst_uic::runCompare()
     if (generatedFileContents != originalFileContents) {
         const QString diff = generateDiff(originalFile, generatedFile);
         if (!diff.isEmpty())
-             qWarning().noquote().nospace() << "Difference:\n" << diff;
+            outputDiff(diff);
     }
 
     QCOMPARE(generatedFileContents, originalFileContents);