diff options
Diffstat (limited to 'tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index 47e432d432..771e79e79e 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -121,9 +121,7 @@ private slots: void uncPaths_data(); void uncPaths(); #endif -#if !defined(Q_OS_WIN) && !defined(Q_OS_WINCE) void qtbug15421_hiddenDirs_hiddenFiles(); -#endif }; tst_QDirIterator::tst_QDirIterator() @@ -592,13 +590,15 @@ void tst_QDirIterator::uncPaths() } #endif -// In Unix it is easy to create hidden files, but in Windows it requires -// a special call since hidden files need to be "marked" while in Unix -// anything starting by a '.' is a hidden file. -// For that reason this test is not run in Windows. -#if !defined(Q_OS_WIN) && !defined(Q_OS_WINCE) void tst_QDirIterator::qtbug15421_hiddenDirs_hiddenFiles() { + // In Unix it is easy to create hidden files, but in Windows it requires + // a special call since hidden files need to be "marked" while in Unix + // anything starting by a '.' is a hidden file. + // For that reason this test is not run in Windows. +#if defined Q_OS_WIN || Q_OS_WINCE + QSKIP("To create hidden files a special call is required in Windows."); +#else // Only files { int matches = 0; @@ -627,8 +627,8 @@ void tst_QDirIterator::qtbug15421_hiddenDirs_hiddenFiles() QCOMPARE(matches, 6); QCOMPARE(failures, 0); } +#endif // Q_OS_WIN || Q_OS_WINCE } -#endif QTEST_MAIN(tst_QDirIterator) |