diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-11-26 01:41:53 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-11-26 01:41:53 (GMT) |
| commit | 9ccaecf7825a782bfd29ff6c4118d933cc614726 (patch) | |
| tree | 283235c41a124959506d4357000af9cdb4ca4822 /tests/auto | |
| parent | dda88f1bf0b02cfb0307686afdf8a3bf1e7824bd (diff) | |
| download | Qt-9ccaecf7825a782bfd29ff6c4118d933cc614726.zip Qt-9ccaecf7825a782bfd29ff6c4118d933cc614726.tar.gz Qt-9ccaecf7825a782bfd29ff6c4118d933cc614726.tar.bz2 | |
Slightly improved tst_qmlvisual output
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp index 7fee24f..ef0d4dc 100644 --- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp +++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp @@ -146,11 +146,12 @@ void tst_qmlvisual::visual() #endif QProcess p; - p.setProcessChannelMode(QProcess::MergedChannels); p.start(qmlruntime, arguments); - QVERIFY2(p.waitForFinished(), p.readAllStandardOutput().data()); + bool finished = p.waitForFinished(); + QByteArray output = p.readAllStandardOutput() + p.readAllStandardError(); + QVERIFY2(finished, output.data()); if (p.exitCode() != 0) - qDebug() << p.readAllStandardOutput(); + qDebug() << output; QCOMPARE(p.exitStatus(), QProcess::NormalExit); QCOMPARE(p.exitCode(), 0); } |