diff options
Diffstat (limited to 'tests/auto/qprocess/tst_qprocess.cpp')
| -rw-r--r-- | tests/auto/qprocess/tst_qprocess.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index cff6487..d5bc0bd 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -1318,15 +1318,6 @@ protected slots: private: int exitCode; -#ifdef Q_OS_SYMBIAN - enum - { - /** - * The maximum stack size. - */ - SymbianStackSize = 0x14000 - }; -#endif }; //----------------------------------------------------------------------------- @@ -1334,9 +1325,6 @@ void tst_QProcess::processInAThread() { for (int i = 0; i < 10; ++i) { TestThread thread; -#if defined(Q_OS_SYMBIAN) - thread.setStackSize(SymbianStackSize); -#endif thread.start(); QVERIFY(thread.wait(10000)); QCOMPARE(thread.code(), 0); @@ -1359,10 +1347,6 @@ void tst_QProcess::processesInMultipleThreads() thread1.serial = serialCounter++; thread2.serial = serialCounter++; thread3.serial = serialCounter++; - - thread1.setStackSize(SymbianStackSize); - thread2.setStackSize(SymbianStackSize); - thread3.setStackSize(SymbianStackSize); #endif thread1.start(); thread2.start(); @@ -1874,7 +1858,6 @@ void tst_QProcess::setEnvironment() QCOMPARE(process.readAll(), value.toLocal8Bit()); } -#endif } //----------------------------------------------------------------------------- @@ -1885,8 +1868,9 @@ void tst_QProcess::setProcessEnvironment_data() void tst_QProcess::setProcessEnvironment() { -#if !defined (Q_OS_WINCE) - // there is no concept of system variables on Windows CE as there is no console +#if defined (Q_OS_WINCE) || defined(Q_OS_SYMBIAN) + QSKIP("OS doesn't support environment variables", SkipAll); +#endif // make sure our environment variables are correct QVERIFY(qgetenv("tst_QProcess").isEmpty()); @@ -2388,3 +2372,4 @@ void tst_QProcess::invalidProgramString() QTEST_MAIN(tst_QProcess) #include "tst_qprocess.moc" #endif + |