diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/io/qprocess/testForwarding/main.cpp | 10 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/tests/auto/corelib/io/qprocess/testForwarding/main.cpp b/tests/auto/corelib/io/qprocess/testForwarding/main.cpp index d9571141ae..2987705b1a 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/main.cpp +++ b/tests/auto/corelib/io/qprocess/testForwarding/main.cpp @@ -47,22 +47,22 @@ int main() QProcess process; process.setProcessChannelMode(QProcess::ForwardedChannels); if (process.processChannelMode() != QProcess::ForwardedChannels) - return -1; + return 1; process.start("testProcessEcho/testProcessEcho"); if (!process.waitForStarted(5000)) - return -1; + return 2; if (process.write("forwarded\n") != 10) - return -1; + return 3; process.closeWriteChannel(); if (!process.waitForFinished(5000)) - return -1; + return 4; if (process.bytesAvailable() != 0) - return -1; + return 5; #endif return 0; } diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 8965c0787e..65716347c7 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -1116,7 +1116,17 @@ void tst_QProcess::forwardedChannelsOutput() process.start("testForwarding/testForwarding"); QVERIFY(process.waitForStarted(5000)); QVERIFY(process.waitForFinished(5000)); - QVERIFY(!process.exitCode()); + const char *err; + switch (process.exitCode()) { + case 0: err = "ok"; break; + case 1: err = "processChannelMode is wrong"; break; + case 2: err = "failed to start"; break; + case 3: err = "failed to write"; break; + case 4: err = "did not finish"; break; + case 5: err = "unexpected stdout"; break; + default: err = "unknown exit code"; break; + } + QVERIFY2(!process.exitCode(), err); QByteArray data = process.readAll(); QVERIFY(!data.isEmpty()); QVERIFY(data.contains("forwarded")); |