summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfileinfo
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-10 07:36:49 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-10 07:36:49 (GMT)
commit4942e2834c1da00bfceec6430ce351888efc1976 (patch)
tree944be213e12faa16fb260f5dec4f97d5fcc7c5fc /tests/auto/qfileinfo
parent6cc14b9bd84de30471db40f73b119ba33356a6ba (diff)
parent5d01d0cde28f2ac1ff9b5d8ca731edcf38725051 (diff)
downloadQt-4942e2834c1da00bfceec6430ce351888efc1976.zip
Qt-4942e2834c1da00bfceec6430ce351888efc1976.tar.gz
Qt-4942e2834c1da00bfceec6430ce351888efc1976.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto/qfileinfo')
-rw-r--r--tests/auto/qfileinfo/tst_qfileinfo.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 512f2b6..a87e306 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -749,7 +749,7 @@ void tst_QFileInfo::size()
void tst_QFileInfo::systemFiles()
{
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE)
QSKIP("This is a Windows only test", SkipAll);
#endif
QFileInfo fi("c:\\pagefile.sys");
@@ -1077,7 +1077,13 @@ void tst_QFileInfo::isWritable()
{
QVERIFY(QFileInfo("tst_qfileinfo.cpp").isWritable());
#ifdef Q_OS_WIN
- QVERIFY(!QFileInfo("c:\\pagefile.sys").isWritable());
+#ifdef Q_OS_WINCE
+ QFileInfo fi("\\Windows\\wince.nls");
+#else
+ QFileInfo fi("c:\\pagefile.sys");
+#endif
+ QVERIFY(fi.exists());
+ QVERIFY(!fi.isWritable());
#endif
#ifdef Q_OS_UNIX
if (::getuid() == 0)