diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-02-19 08:25:40 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-02-19 08:25:40 (GMT) |
| commit | c3f85f9f3a15c7e880d1d2b10ef6b98881f7f87c (patch) | |
| tree | decbe3bbf4a7bf834c13dbd35234c76c77d1128a /tests/auto | |
| parent | 617ab83ba8736b50a819c5a87dfe2e384268a27a (diff) | |
| download | Qt-c3f85f9f3a15c7e880d1d2b10ef6b98881f7f87c.zip Qt-c3f85f9f3a15c7e880d1d2b10ef6b98881f7f87c.tar.gz Qt-c3f85f9f3a15c7e880d1d2b10ef6b98881f7f87c.tar.bz2 | |
Skip OpenGL threading tests on Mac as they were causing reboots
Reviewed-By: TrustMe
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qgl_threads/tst_openglthreading.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
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); |