Test: remove QSKIP in tst_QDir::dotAndDotDot

Instead omit the omit the whole test when Q_OS_WINCE is defined.

Change-Id: I8c0f12c63bbc4567edb3a8626ab060d5ce38f3cd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
This commit is contained in:
Caroline Chao 2012-10-18 09:16:27 +02:00 committed by The Qt Project
parent a23be1b3e1
commit 1fef528d33

View File

@ -150,7 +150,9 @@ private slots:
void operator_eq();
#ifndef Q_OS_WINCE
void dotAndDotDot();
#endif
void homePath();
void tempPath();
void rootPath();
@ -1318,18 +1320,17 @@ void tst_QDir::operator_eq()
dir1.setPath("..");
}
#ifndef Q_OS_WINCE
// WinCE does not have . nor ..
void tst_QDir::dotAndDotDot()
{
#if defined(Q_OS_WINCE)
QSKIP("WinCE does not have . nor ..");
#else
QDir dir(QString((m_dataPath + "/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
}
#endif
void tst_QDir::homePath()
{