diff options
Diffstat (limited to 'tests/auto/corelib/io/qdir')
-rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index b66a7dac6a..28ccad3b56 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -141,9 +141,7 @@ private slots: void operator_eq(); -#ifndef Q_OS_WINCE void dotAndDotDot(); -#endif void homePath(); void tempPath(); void rootPath(); @@ -1217,17 +1215,18 @@ void tst_QDir::operator_eq() dir1.setPath(".."); } -// WinCE does not have . nor .. -#ifndef Q_OS_WINCE void tst_QDir::dotAndDotDot() { +#if defined(Q_OS_WINCE) + QSKIP("WinCE does not have . nor .."); +#else QDir dir(QString(SRCDIR "testdir/")); QStringList entryList = dir.entryList(QDir::Dirs); QCOMPARE(entryList, QStringList() << QString(".") << QString("..") << QString("dir") << QString("spaces")); entryList = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QCOMPARE(entryList, QStringList() << QString("dir") << QString("spaces")); -} #endif +} void tst_QDir::homePath() { |