From c3f85f9f3a15c7e880d1d2b10ef6b98881f7f87c Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Fri, 19 Feb 2010 09:25:40 +0100 Subject: Skip OpenGL threading tests on Mac as they were causing reboots Reviewed-By: TrustMe --- tests/auto/qgl_threads/tst_openglthreading.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/auto/qgl_threads/tst_openglthreading.cpp b/tests/auto/qgl_threads/tst_openglthreading.cpp index 6634869..cf100cb 100644 --- a/tests/auto/qgl_threads/tst_openglthreading.cpp +++ b/tests/auto/qgl_threads/tst_openglthreading.cpp @@ -145,6 +145,10 @@ public: void tst_OpenGLThreading::swapInThread() { +#ifdef Q_OS_MAC + QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll); +#endif + QGLFormat format; format.setSwapInterval(1); ForegroundWidget widget(format); @@ -247,6 +251,10 @@ private: void tst_OpenGLThreading::textureUploadInThread() { +#ifdef Q_OS_MAC + QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll); +#endif + TextureDisplay display; CreateAndUploadThread thread(&display); @@ -417,6 +425,10 @@ void tst_OpenGLThreading::renderInThread_data() void tst_OpenGLThreading::renderInThread() { +#ifdef Q_OS_MAC + QSKIP("OpenGL threading tests are currently disabled on mac as they were causing reboots", SkipAll); +#endif + QFETCH(bool, resize); QFETCH(bool, update); -- cgit v0.12