Avoid using QSKIP in lieu of compile-time checks

QSKIP is intended to be used to skip test functions that are found at
run-time to be inapplicable or unsafe.  If a test function can be
determined to be inapplicable at compile-time, the entire test function
should be omitted instead of replacing the body of the test function
with a QSKIP, which only serves to slow down test runs and to inflate
test run-rates with empty, inapplicable tests.

Task-number: QTQAINFRA-278

Change-Id: Ib2025339422749cf216e87ac414a3056250bf8f9
Reviewed-on: http://codereview.qt-project.org/5942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 27e1c7d14b..b087c8fda0 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -63,10 +63,14 @@ public slots:
     void cleanup();
 private slots:
     void getSetCheck();
+#if !defined(Q_OS_WINCE) || !defined(WINCE_EMULATOR_TEST)
     void constructing_QTcpSocket();
+#endif
     void constructing_QFile();
     void read_QByteArray();
+#if !defined(Q_OS_WINCE) || !defined(WINCE_EMULATOR_TEST)
     void unget();
+#endif
     void peek();
     void peekAndRead();
 
@@ -113,11 +117,11 @@ void tst_QIODevice::cleanup()
 }
 
 //----------------------------------------------------------------------------------
+
+// Networking tests in a WinCE emulator are unstable.
+#if !defined(Q_OS_WINCE) || !defined(WINCE_EMULATOR_TEST)
 void tst_QIODevice::constructing_QTcpSocket()
 {
-#if defined(Q_OS_WINCE) && defined(WINCE_EMULATOR_TEST)
-    QSKIP("Networking tests in a WinCE emulator are unstable", SkipAll);
-#endif
     QTcpSocket socket;
     QIODevice *device = &socket;
 
@@ -157,6 +161,7 @@ void tst_QIODevice::constructing_QTcpSocket()
     }
     QCOMPARE(*c1, *c2);
 }
+#endif
 
 //----------------------------------------------------------------------------------
 void tst_QIODevice::constructing_QFile()
@@ -209,11 +214,11 @@ void tst_QIODevice::read_QByteArray()
 }
 
 //--------------------------------------------------------------------
+
+// Networking tests in a WinCE emulator are unstable.
+#if !defined(Q_OS_WINCE) || !defined(WINCE_EMULATOR_TEST)
 void tst_QIODevice::unget()
 {
-#if defined(Q_OS_WINCE) && defined(WINCE_EMULATOR_TEST)
-    QSKIP("Networking tests in a WinCE emulator are unstable", SkipAll);
-#endif
     QBuffer buffer;
     buffer.open(QBuffer::ReadWrite);
     buffer.write("ZXCV");
@@ -310,6 +315,7 @@ void tst_QIODevice::unget()
             socket.close();
     }
 }
+#endif
 
 //--------------------------------------------------------------------
 void tst_QIODevice::peek()