diff options
Diffstat (limited to 'tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index d928ddd998..9727ccb407 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -37,7 +37,7 @@ #include <QtCore/private/qfsfileengine_p.h> -#if defined(Q_OS_VXWORKS) +#if defined(Q_OS_VXWORKS) || defined(Q_OS_WINRT) #define Q_NO_SYMLINKS #endif @@ -110,6 +110,10 @@ private slots: #ifndef Q_OS_WIN void hiddenDirs_hiddenFiles(); #endif +#ifdef BUILTIN_TESTDATA +private: + QSharedPointer<QTemporaryDir> m_dataDir; +#endif }; void tst_QDirIterator::initTestCase() @@ -136,6 +140,10 @@ void tst_QDirIterator::initTestCase() } testdata_dir += QStringLiteral("/entrylist"); +#elif defined(BUILTIN_TESTDATA) + m_dataDir = QEXTRACTTESTDATA("/"); + QVERIFY2(!m_dataDir.isNull(), qPrintable("Could not extract test data")); + QString testdata_dir = m_dataDir->path(); #else // chdir into testdata directory, then find testdata by relative paths. @@ -212,6 +220,11 @@ void tst_QDirIterator::cleanupTestCase() Q_FOREACH(QString dirName, createdDirectories) currentDir.rmdir(dirName); + +#ifdef Q_OS_WINRT + QDir::setCurrent(QCoreApplication::applicationDirPath()); +#endif // Q_OS_WINRT + } void tst_QDirIterator::iterateRelativeDirectory_data() |