diff options
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qfile/tst_qfile.cpp | 7 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 5d976896d8..d4f99c5d74 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -609,10 +609,10 @@ void tst_QFile::size() fclose(stream); } + // Currently low level file I/O is not well supported on Windows CE, so + // skip this part of the test. +#ifndef Q_OS_WINCE { -#ifdef Q_OS_WINCE - QSKIP("Currently low level file I/O not well supported on Windows CE", SkipSingle); -#endif QFile f; int fd = QT_OPEN(filename.toLocal8Bit().constData(), QT_OPEN_RDONLY); @@ -624,6 +624,7 @@ void tst_QFile::size() f.close(); QT_CLOSE(fd); } +#endif } void tst_QFile::sizeNoExist() 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(); |