diff -r 56cd8111b7f7 -r 41300fa6a67c tests/auto/qsharedmemory/tst_qsharedmemory.cpp --- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -708,10 +708,7 @@ void tst_QSharedMemory::simpleProcessProducerConsumer_data() { QTest::addColumn("processes"); - int tries = 10; -#ifdef Q_OS_WIN - tries = 5; -#endif + int tries = 5; for (int i = 0; i < tries; ++i) { QTest::newRow("1 process") << 1; QTest::newRow("5 processes") << 5; @@ -737,7 +734,7 @@ #endif QProcess producer; producer.setProcessChannelMode(QProcess::ForwardedChannels); - producer.start( QFileInfo("./lackey/lackey.exe").absoluteFilePath(), arguments); + producer.start( "./lackey/lackey", arguments); producer.waitForStarted(); QVERIFY(producer.error() != QProcess::FailedToStart); @@ -759,12 +756,12 @@ ++failedProcesses; } - producer.waitForFinished(5000); + QVERIFY(producer.waitForFinished(5000)); bool consumerFailed = false; while (!consumers.isEmpty()) { - consumers.first()->waitForFinished(2000); + QVERIFY(consumers.first()->waitForFinished(3000)); if (consumers.first()->state() == QProcess::Running || consumers.first()->exitStatus() != QProcess::NormalExit || consumers.first()->exitCode() != 0) {