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, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
index 041f801672..87991d8309 100644
--- a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
+++ b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
@@ -62,7 +62,9 @@ private slots:
 
     void nesting();
     void reentering();
+#ifndef QT_NO_EXCEPTIONS
     void exception();
+#endif
 };
 
 class SingletonObject: public QObject
@@ -207,11 +209,9 @@ static void exception_helper(int &val)
 }
 #endif
 
+#ifndef QT_NO_EXCEPTIONS
 void tst_QThreadOnce::exception()
 {
-#if defined(QT_NO_EXCEPTIONS)
-    QSKIP("Compiled without exceptions, skipping test", SkipAll);
-#else
     int count = 0;
 
     try {
@@ -227,8 +227,8 @@ void tst_QThreadOnce::exception()
         QVERIFY2(false, "Exception shouldn't have been thrown...");
     }
     QCOMPARE(count, 2);
-#endif
 }
+#endif
 
 QTEST_MAIN(tst_QThreadOnce)
 #include "tst_qthreadonce.moc"