diff options
| author | Zeno Albisser <zeno.albisser@nokia.com> | 2010-05-04 12:10:46 (GMT) |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-05-04 12:10:46 (GMT) |
| commit | 1cfc49a59eaa54fa8060530e585052d41fd58cad (patch) | |
| tree | b047be2149a7d7d50f676cb9c62ffcb682620e4d | |
| parent | a30b5ebbbcc4af0b82894edf4e026d4aea25bd95 (diff) | |
| download | Qt-1cfc49a59eaa54fa8060530e585052d41fd58cad.zip Qt-1cfc49a59eaa54fa8060530e585052d41fd58cad.tar.gz Qt-1cfc49a59eaa54fa8060530e585052d41fd58cad.tar.bz2 | |
Revert "Temporarily disable tests that use createNtfsJunction()"
This reverts commit 498786a2ab27680b27f8e57b422ff8f32f0c3790.
| -rw-r--r-- | tests/auto/qfileinfo/tst_qfileinfo.cpp | 2 | ||||
| -rw-r--r-- | tests/shared/filesystem.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 83b650a..c260946 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -1327,7 +1327,6 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data() QTest::newRow("relative file symlink") << relSymlink << true << QDir::fromNativeSeparators(relTarget) << target.canonicalFilePath(); } -#if 0 //Junctions QString target = "target"; QString junction = "junction_pwd"; @@ -1363,7 +1362,6 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data() FileSystem::createNtfsJunction(rootVolume, junction); QTest::newRow("mountpoint") << junction << true << QDir::fromNativeSeparators(rootPath) << QDir::rootPath(); } -#endif } void tst_QFileInfo::ntfsJunctionPointsAndSymlinks() diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h index dad4ef8c..079a6dc 100644 --- a/tests/shared/filesystem.h +++ b/tests/shared/filesystem.h @@ -95,8 +95,6 @@ struct FileSystem } return false; } - -#if 0 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) static void createNtfsJunction(QString target, QString linkName) { @@ -150,7 +148,6 @@ struct FileSystem QVERIFY(ioc); } #endif -#endif private: QDir currentDir; |