diff options
Diffstat (limited to 'tests/auto/corelib/io/qprocess/tst_qprocess.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index c6a5f39319..d28efd8934 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -170,6 +170,8 @@ private slots: void detachedWorkingDirectoryAndPid(); #ifndef Q_OS_WINCE void switchReadChannels(); +#endif +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) void setWorkingDirectory(); #endif void startFinishStartFinish(); @@ -2188,8 +2190,9 @@ void tst_QProcess::switchReadChannels() //----------------------------------------------------------------------------- -// Windows CE does not support working directory logic. -#ifndef Q_OS_WINCE +// Windows CE does not support working directory logic, and +// setWorkingDirectory will chdir before starting the process on unices. +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) void tst_QProcess::setWorkingDirectory() { process = new QProcess; @@ -2199,9 +2202,6 @@ void tst_QProcess::setWorkingDirectory() #else process->start("testSetWorkingDirectory/testSetWorkingDirectory"); #endif -#ifndef Q_OS_WIN - QSKIP("setWorkingDirectory will chdir before starting the process on unices", SkipAll); -#endif QVERIFY(process->waitForFinished()); QByteArray workingDir = process->readAllStandardOutput(); |