summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdir
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2010-05-10 11:25:54 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2010-05-10 11:25:54 (GMT)
commitb32a3940f0d23332c73b8e0b60c442cdda91e67e (patch)
tree9c3752aa64075d48a86dfe14ba1c9273ce5f65b7 /tests/auto/qdir
parent5f52316a90b7e77295cefc5fac9d4acd0761d79f (diff)
downloadQt-b32a3940f0d23332c73b8e0b60c442cdda91e67e.zip
Qt-b32a3940f0d23332c73b8e0b60c442cdda91e67e.tar.gz
Qt-b32a3940f0d23332c73b8e0b60c442cdda91e67e.tar.bz2
Fix for root path issue in tst_qdir. (case "drive:")
Windows only: Since the working directory is not necessarily located on the root drive, we should not rely on rootPath for the test. Reviewed-by: TrustMe
Diffstat (limited to 'tests/auto/qdir')
-rw-r--r--tests/auto/qdir/tst_qdir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 4704bb8..661a4c7 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -818,7 +818,7 @@ void tst_QDir::canonicalPath_data()
QTest::newRow("drive:/../.. ") << QDir::rootPath().append("../..") << QDir::rootPath();
QTest::newRow("drive:\\.\\") << QDir::toNativeSeparators(QDir::rootPath().append("./")) << QDir::rootPath();
QTest::newRow("drive:\\..\\..") << QDir::toNativeSeparators(QDir::rootPath().append("../..")) << QDir::rootPath();
- QTest::newRow("drive:") << QDir::rootPath().left(2) << QDir::currentPath();
+ QTest::newRow("drive:") << QDir().canonicalPath().left(2) << QDir().canonicalPath();
#endif
}