From 5cfac290cad8114357b789f771a9e7d36d0e784d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 1 Jul 2013 10:54:35 +0200 Subject: 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 Reviewed-by: Andreas Holzammer --- tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'tests/auto/corelib/io/qprocess') 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; -- cgit v1.2.3