From 6dfeee624aa6c8e833044cc43c0d6db83c04a07e Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Thu, 18 Oct 2012 09:31:51 +0200
Subject: Test: remove QSKIP in tst_file

Instead omit the whole tests when appropriate.

Change-Id: I5eae127a497e290c5e4ba1a81a8f325c300471c1
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
 tests/auto/corelib/io/qfile/tst_qfile.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 0dddf6ca03..1f2d4fe4f5 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -145,8 +145,10 @@ private slots:
     void append();
     void permissions_data();
     void permissions();
+#ifdef Q_OS_WIN
     void permissionsNtfs_data();
     void permissionsNtfs();
+#endif
     void setPermissions();
     void copy();
     void copyAfterFail();
@@ -192,7 +194,9 @@ private slots:
     void writeLargeDataBlock();
     void readFromWriteOnlyFile();
     void writeToReadOnlyFile();
+#if defined(Q_OS_LINUX) || defined(Q_OS_AIX) || defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
     void virtualFile();
+#endif
     void textFile();
     void rename_data();
     void rename();
@@ -1132,6 +1136,7 @@ void tst_QFile::permissions()
     QCOMPARE((staticResult == QFile::Permissions(perms)), expected);
 }
 
+#ifdef Q_OS_WIN
 void tst_QFile::permissionsNtfs_data()
 {
     permissions_data();
@@ -1139,14 +1144,11 @@ void tst_QFile::permissionsNtfs_data()
 
 void tst_QFile::permissionsNtfs()
 {
-#ifdef Q_OS_WIN
     QScopedValueRollback<int> ntfsMode(qt_ntfs_permission_lookup);
     qt_ntfs_permission_lookup++;
     permissions();
-#else
-    QSKIP("windows test");
-#endif
 }
+#endif
 
 void tst_QFile::setPermissions()
 {
@@ -2290,6 +2292,8 @@ void tst_QFile::writeToReadOnlyFile()
     QCOMPARE(file.write(&c, 1), qint64(-1));
 }
 
+#if defined(Q_OS_LINUX) || defined(Q_OS_AIX) || defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+// This platform have 0-sized virtual files
 void tst_QFile::virtualFile()
 {
     // test if QFile works with virtual files
@@ -2298,10 +2302,8 @@ void tst_QFile::virtualFile()
     fname = "/proc/self/maps";
 #elif defined(Q_OS_AIX)
     fname = QString("/proc/%1/map").arg(getpid());
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#else // defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
     fname = "/proc/curproc/map";
-#else
-    QSKIP("This platform does not have 0-sized virtual files");
 #endif
 
     // consistency check
@@ -2334,6 +2336,7 @@ void tst_QFile::virtualFile()
     QVERIFY(f.seek(1));
     QCOMPARE(f.pos(), Q_INT64_C(1));
 }
+#endif
 
 void tst_QFile::textFile()
 {
-- 
cgit v1.2.3