summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2018-02-26 15:17:39 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2018-03-01 09:37:58 +0000
commit1875db1849acd074d09c1f0328a1db5290422b2f (patch)
treec3788681a816b46e756ca5228d77394521a54b87 /tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
parentcb2a6f6a9f864fa38c45a049b9394ec4403e1aad (diff)
tst_QLocalSocket: Fix not showing error output in processConnection
The stdout of the processes used in the test was dumped if there was an error, but the processes write their error messages to stderr. Use MergedChannels process channel mode to dump both output streams. Change-Id: I1645fd31c394da0871ee6ae36d37ca9a04d86052 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp')
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 0d538865a3..9a821deefe 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -969,12 +969,14 @@ void tst_QLocalSocket::processConnection()
QProcess producer;
ProcessOutputDumper producerOutputDumper(&producer);
QList<QProcess*> consumers;
+ producer.setProcessChannelMode(QProcess::MergedChannels);
producer.start(socketProcess, serverArguments);
QVERIFY2(producer.waitForStarted(-1), qPrintable(producer.errorString()));
for (int i = 0; i < processes; ++i) {
QStringList arguments = QStringList() << "--client";
QProcess *p = new QProcess;
consumers.append(p);
+ p->setProcessChannelMode(QProcess::MergedChannels);
p->start(socketProcess, arguments);
}