From b32a3940f0d23332c73b8e0b60c442cdda91e67e Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Mon, 10 May 2010 13:25:54 +0200 Subject: 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 --- tests/auto/qdir/tst_qdir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- cgit v0.12