Make skipping of test consistent.

On Mac every function was skipped individually,
on the other platforms it was marked as
insignificant.

See also QTBUG-22560 and QTBUG-22361

Change-Id: Ie9b9c617006d5a8c19d042b8be89e449c5ac70bc
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

2 files changed, 1 insertions, 31 deletions

diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro
index 5dc8eba497..754f494cfa 100644
--- a/tests/auto/opengl/qglthreads/qglthreads.pro
+++ b/tests/auto/opengl/qglthreads/qglthreads.pro
@@ -10,5 +10,5 @@ x11 {
     LIBS += $$QMAKE_LIBS_X11
 }
 
-win32|linux-*:CONFIG+=insignificant_test # QTBUG-22560
+CONFIG+=insignificant_test # QTBUG-22560
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index 979ffce57b..267e3260f1 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -140,11 +140,6 @@ public:
 
 void tst_QGLThreads::swapInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
-
     QGLFormat format;
     format.setSwapInterval(1);
     ForegroundWidget widget(format);
@@ -250,11 +245,6 @@ private:
 
 void tst_QGLThreads::textureUploadInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
-
     TextureDisplay display;
     CreateAndUploadThread thread(&display);
 
@@ -426,10 +416,6 @@ void tst_QGLThreads::renderInThread_data()
 
 void tst_QGLThreads::renderInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
 
     QFETCH(bool, resize);
     QFETCH(bool, update);
@@ -635,10 +621,6 @@ private:
 */
 void tst_QGLThreads::painterOnGLWidgetInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
           (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
         QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
@@ -660,10 +642,6 @@ void tst_QGLThreads::painterOnGLWidgetInThread()
 */
 void tst_QGLThreads::painterOnPixmapInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
 #ifdef Q_WS_X11
     QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.");
 #endif
@@ -682,10 +660,6 @@ void tst_QGLThreads::painterOnPixmapInThread()
 */
 void tst_QGLThreads::painterOnPboInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
           (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
         QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
@@ -711,10 +685,6 @@ void tst_QGLThreads::painterOnPboInThread()
 */
 void tst_QGLThreads::painterOnFboInThread()
 {
-#ifdef Q_OS_MAC
-    // The test is crashing but there are risks of reboot so keeping QSKIP here.
-    QSKIP("QTBUG-22361");
-#endif
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
           (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
         QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");