diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-01 10:54:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-02 16:33:08 +0200 |
| commit | 5cfac290cad8114357b789f771a9e7d36d0e784d (patch) | |
| tree | 215333547f8511d0b7e5be33175e390fafb34e67 /tests | |
| parent | e8c3316ab03584fe18e4e2d49fcb1a70a7231d16 (diff) | |
remove wait calls in tst_QProcess::simpleStart
Instead of calling different wait functions on different platforms,
we use QTRY_COMPARE to check the process state.
Change-Id: I6489cabce9e63f9c8b1036f3cccbf35b52df72e7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 613bfd5c17..3862553a4b 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -267,15 +267,7 @@ void tst_QProcess::simpleStart() QCOMPARE(process->state(), QProcess::Running); QVERIFY2(process->waitForStarted(5000), qPrintable(process->errorString())); QCOMPARE(process->state(), QProcess::Running); -#if defined(Q_OS_WINCE) - // Note: This actually seems incorrect, it will only exit the while loop when finishing fails - while (process->waitForFinished(5000)) - { } -#else - while (process->waitForReadyRead(5000)) - { } -#endif - QCOMPARE(int(process->state()), int(QProcess::NotRunning)); + QTRY_COMPARE(process->state(), QProcess::NotRunning); delete process; process = 0; |