diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-07-19 13:05:52 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-08-03 08:09:30 +0000 |
commit | f0ff73f631093b11c77d8d6fb548acfe8eb62583 (patch) | |
tree | 5e36125dd69e6d06249ca686fb9947b04da23da3 /tests/auto/corelib/io/qprocess/testForwarding | |
parent | 8c4207dddf9b2af0767de2ef0a10652612d462a5 (diff) |
QProcess::startDetached: Fix behavior change on Windows
Do not overwrite stdout/stderr by default, but only if requested.
This restores the behavior of QProcess::startDetached of Qt 5.9.
Task-number: QTBUG-67905
Change-Id: Idccf7b0da7bd80f88a0624286ddf2851bc974fb1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/corelib/io/qprocess/testForwarding')
-rw-r--r-- | tests/auto/corelib/io/qprocess/testForwarding/main.cpp | 57 |
1 files changed, 44 insertions, 13 deletions
diff --git a/tests/auto/corelib/io/qprocess/testForwarding/main.cpp b/tests/auto/corelib/io/qprocess/testForwarding/main.cpp index b7367ff8c6..b5d56a1138 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/main.cpp +++ b/tests/auto/corelib/io/qprocess/testForwarding/main.cpp @@ -27,15 +27,32 @@ ****************************************************************************/ #include <QtCore/QCoreApplication> +#include <QtCore/QDeadlineTimer> #include <QtCore/QProcess> +#include <QtCore/QTemporaryFile> +#include <QtCore/QThread> #include <stdlib.h> +static bool waitForDoneFileWritten(const QString &filePath, int msecs = 30000) +{ + QDeadlineTimer t(msecs); + do { + QThread::msleep(250); + QFile file(filePath); + if (!file.open(QIODevice::ReadOnly)) + continue; + if (file.readAll() == "That's all folks!") + return true; + } while (!t.hasExpired()); + return false; +} + int main(int argc, char **argv) { QCoreApplication app(argc, argv); - if (argc < 3) + if (argc < 4) return 13; QProcess process; @@ -50,23 +67,37 @@ int main(int argc, char **argv) if (process.inputChannelMode() != inmode) return 11; - process.start("testProcessEcho2/testProcessEcho2"); + if (atoi(argv[3])) { + QTemporaryFile doneFile("testForwarding_XXXXXX.txt"); + if (!doneFile.open()) + return 12; + doneFile.close(); + + process.setProgram("testForwardingHelper/testForwardingHelper"); + process.setArguments(QStringList(doneFile.fileName())); + if (!process.startDetached()) + return 13; + if (!waitForDoneFileWritten(doneFile.fileName())) + return 14; + } else { + process.start("testProcessEcho2/testProcessEcho2"); - if (!process.waitForStarted(5000)) - return 2; + if (!process.waitForStarted(5000)) + return 2; - if (inmode == QProcess::ManagedInputChannel && process.write("forwarded") != 9) - return 3; + if (inmode == QProcess::ManagedInputChannel && process.write("forwarded") != 9) + return 3; - process.closeWriteChannel(); - if (!process.waitForFinished(5000)) - return 4; + process.closeWriteChannel(); + if (!process.waitForFinished(5000)) + return 4; - if ((mode == QProcess::ForwardedOutputChannel || mode == QProcess::ForwardedChannels) + if ((mode == QProcess::ForwardedOutputChannel || mode == QProcess::ForwardedChannels) && !process.readAllStandardOutput().isEmpty()) - return 5; - if ((mode == QProcess::ForwardedErrorChannel || mode == QProcess::ForwardedChannels) + return 5; + if ((mode == QProcess::ForwardedErrorChannel || mode == QProcess::ForwardedChannels) && !process.readAllStandardError().isEmpty()) - return 6; + return 6; + } return 0; } |