1 files changed, 71 insertions, 14 deletions

diff --git a/tests/auto/corelib/io/qprocess/testDetached/main.cpp b/tests/auto/corelib/io/qprocess/testDetached/main.cpp
index 702cabe873..c10e32d584 100644
--- a/tests/auto/corelib/io/qprocess/testDetached/main.cpp
+++ b/tests/auto/corelib/io/qprocess/testDetached/main.cpp
@@ -40,32 +40,89 @@
 #include <windows.h>
 #endif
 
+static void writeStuff(QFile &f)
+{
+    f.write(QDir::currentPath().toUtf8());
+    f.putChar('\n');
+#if defined(Q_OS_UNIX)
+    f.write(QByteArray::number(quint64(getpid())));
+#elif defined(Q_OS_WIN)
+    f.write(QByteArray::number(quint64(GetCurrentProcessId())));
+#endif
+    f.putChar('\n');
+    f.write(qgetenv("tst_QProcess"));
+    f.putChar('\n');
+}
+
+struct Args
+{
+    int exitCode = 0;
+    QByteArray errorMessage;
+    QString fileName;
+    FILE *channel = nullptr;
+    QByteArray channelName;
+};
+
+static Args parseArguments(const QStringList &args)
+{
+    Args result;
+    if (args.count() < 2) {
+        result.exitCode = 128;
+        result.errorMessage = "Usage: testDetached [--out-channel={stdout|stderr}] filename.txt\n";
+        return result;
+    }
+    for (const QString &arg : args) {
+        if (arg.startsWith("--")) {
+            if (!arg.startsWith("--out-channel=")) {
+                result.exitCode = 2;
+                result.errorMessage = "Unknown argument " + arg.toLocal8Bit();
+                return result;
+            }
+            result.channelName = arg.mid(14).toLocal8Bit();
+            if (result.channelName == "stdout") {
+                result.channel = stdout;
+            } else if (result.channelName == "stderr") {
+                result.channel = stderr;
+            } else {
+                result.exitCode = 3;
+                result.errorMessage = "Unknown channel " + result.channelName;
+                return result;
+            }
+        } else {
+            result.fileName = arg;
+        }
+    }
+    return result;
+}
+
 int main(int argc, char **argv)
 {
     QCoreApplication app(argc, argv);
 
-    QStringList args = app.arguments();
-    if (args.count() != 2) {
-        fprintf(stderr, "Usage: testDetached filename.txt\n");
-        return 128;
+    const Args args = parseArguments(app.arguments());
+    if (args.exitCode) {
+        fprintf(stderr, "testDetached: %s\n", args.errorMessage.constData());
+        return args.exitCode;
     }
 
-    QFile f(args.at(1));
+    if (args.channel) {
+        QFile channel;
+        if (!channel.open(args.channel, QIODevice::WriteOnly | QIODevice::Text)) {
+            fprintf(stderr, "Cannot open channel %s for writing: %s\n",
+                    qPrintable(args.channelName), qPrintable(channel.errorString()));
+            return 4;
+        }
+        writeStuff(channel);
+    }
+
+    QFile f(args.fileName);
     if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
         fprintf(stderr, "Cannot open %s for writing: %s\n",
                 qPrintable(f.fileName()), qPrintable(f.errorString()));
         return 1;
     }
 
-    f.write(QDir::currentPath().toUtf8());
-    f.putChar('\n');
-#if defined(Q_OS_UNIX)
-    f.write(QByteArray::number(quint64(getpid())));
-#elif defined(Q_OS_WIN)
-    f.write(QByteArray::number(quint64(GetCurrentProcessId())));
-#endif
-    f.putChar('\n');
-
+    writeStuff(f);
     f.close();
 
     return 0;