From 18a3ebe4e5999b4f01c3f006ae790dfe4bded3a3 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Tue, 16 Oct 2012 14:32:37 +0200 Subject: Test: remove QSKIP in tst_QDirIterator::hiddenDirs_hiddenFiles Instead omit the whole test when Q_OS_WIN is defined. Change-Id: I08060168edb2353f4960129b1c0654fea165ca6c Reviewed-by: J-P Nurmi --- tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index a6be378d3b..f3fc6da968 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -120,7 +120,9 @@ private slots: void uncPaths_data(); void uncPaths(); #endif +#ifndef Q_OS_WIN void hiddenDirs_hiddenFiles(); +#endif }; void tst_QDirIterator::initTestCase() @@ -600,15 +602,13 @@ void tst_QDirIterator::uncPaths() } #endif +#ifndef Q_OS_WIN +// 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. void tst_QDirIterator::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) - QSKIP("To create hidden files a special call is required in Windows."); -#else // Only files { int matches = 0; @@ -637,8 +637,8 @@ void tst_QDirIterator::hiddenDirs_hiddenFiles() QCOMPARE(matches, 6); QCOMPARE(failures, 0); } -#endif // Q_OS_WIN || Q_OS_WINCE } +#endif // Q_OS_WIN QTEST_MAIN(tst_QDirIterator) -- cgit v1.2.3