3 files changed, 24 insertions, 10 deletions
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 6c147d68c8..8174cd942f 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -1073,10 +1073,8 @@ void tst_QFileInfo::fileTimes()
 #endif
 #if defined(Q_OS_WINCE)
     QEXPECT_FAIL("simple", "WinCE only stores date of access data, not the time", Continue);
-#elif defined(Q_OS_BLACKBERRY)
-    QEXPECT_FAIL("simple", "Blackberry OS uses the noatime filesystem option", Continue);
-    QEXPECT_FAIL("longfile", "Blackberry OS uses the noatime filesystem option", Continue);
-    QEXPECT_FAIL("longfile absolutepath", "Blackberry OS uses the noatime filesystem option", Continue);
+#elif defined(Q_OS_QNX)
+    QEXPECT_FAIL("", "QNX uses the noatime filesystem option", Continue);
 #endif
     QVERIFY(fileInfo.lastRead() > beforeRead);
     QVERIFY(fileInfo.lastModified() > beforeWrite);
@@ -1511,8 +1509,7 @@ void tst_QFileInfo::isWritable()
     QVERIFY(fi.exists());
     QVERIFY(!fi.isWritable());
 #endif
-#if defined (Q_OS_BLACKBERRY)
-    // The Blackberry filesystem is read-only
+#if defined (Q_OS_QNX) // On QNX /etc is usually on a read-only filesystem
     QVERIFY(!QFileInfo("/etc/passwd").isWritable());
 #elif defined (Q_OS_UNIX) && !defined(Q_OS_VXWORKS) // VxWorks does not have users/groups
     if (::getuid() == 0)
diff --git a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
index fdb29b60d8..bd9e28beb5 100644
--- a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
+++ b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
@@ -44,6 +44,9 @@
 #include <QtConcurrentRun>
 #include <qlockfile.h>
 #include <qtemporarydir.h>
+#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
+#include <unistd.h>
+#endif
 
 class tst_QLockFile : public QObject
 {
@@ -365,9 +368,12 @@ void tst_QLockFile::staleLockRace()
 
 void tst_QLockFile::noPermissions()
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN)
     // A readonly directory still allows us to create files, on Windows.
     QSKIP("No permission testing on Windows");
+#elif defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
+    if (::geteuid() == 0)
+        QSKIP("Test is not applicable with root privileges");
 #endif
     // Restore permissions so that the QTemporaryDir cleanup can happen
     class PermissionRestorer
diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
index 04c083e653..87bcfe572d 100644
--- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
+++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
@@ -47,9 +47,8 @@
 #include <qdir.h>
 #include <qset.h>
 
-#if defined(Q_OS_UNIX)
-# include <unistd.h> // for geteuid
-# include <sys/types.h>
+#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
+#include <unistd.h> // for geteuid
 #endif
 
 #if defined(Q_OS_WIN)
@@ -199,6 +198,10 @@ void tst_QSaveFile::transactionalWriteNoPermissionsOnDir_data()
 void tst_QSaveFile::transactionalWriteNoPermissionsOnDir()
 {
 #ifdef Q_OS_UNIX
+#if !defined(Q_OS_VXWORKS)
+    if (::geteuid() == 0)
+        QSKIP("Test is not applicable with root privileges");
+#endif
     QFETCH(bool, directWriteFallback);
     QTemporaryDir dir;
     QVERIFY(dir.isValid());
@@ -253,6 +256,10 @@ void tst_QSaveFile::transactionalWriteNoPermissionsOnDir()
 
 void tst_QSaveFile::transactionalWriteNoPermissionsOnFile()
 {
+#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
+    if (::geteuid() == 0)
+        QSKIP("Test is not applicable with root privileges");
+#endif
     // Setup an existing but readonly file
     QTemporaryDir dir;
     QVERIFY(dir.isValid());
@@ -299,6 +306,10 @@ void tst_QSaveFile::transactionalWriteCanceled()
 
 void tst_QSaveFile::transactionalWriteErrorRenaming()
 {
+#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
+    if (::geteuid() == 0)
+        QSKIP("Test is not applicable with root privileges");
+#endif
     QTemporaryDir dir;
     QVERIFY(dir.isValid());
     const QString targetFile = dir.path() + QString::fromLatin1("/outfile");