summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-10-01 08:37:44 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-10-01 08:38:40 (GMT)
commit9c34f75dedddea2e84432dc6f173389a1814d0f9 (patch)
treef68e01175d6114457cfe957fa0ceb213d5ebaa17
parente58293b3b0cb4664efca10229ae2e6556185e8a7 (diff)
downloadQt-9c34f75dedddea2e84432dc6f173389a1814d0f9.zip
Qt-9c34f75dedddea2e84432dc6f173389a1814d0f9.tar.gz
Qt-9c34f75dedddea2e84432dc6f173389a1814d0f9.tar.bz2
Make this test pass on Windows.
Calling rm on . remove the dir on Windows. Reviewed-by:TrustMe
-rw-r--r--tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index ea9304d..2cc2558 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -806,7 +806,10 @@ void tst_QFileSystemModel::sort()
QDir dir(QDir::tempPath());
dir.mkdir("sortTemp");
dir.cd("sortTemp");
- QDirIterator it(dir);
+ QTRY_VERIFY(dir.exists());
+
+ //To be sure we clean the dir if it was there before
+ QDirIterator it(dir.absolutePath(), QDir::NoDotAndDotDot);
while(it.hasNext())
{
it.next();