diff options
| author | Jani Vähäkangas <jani.vahakangas@theqtcompany.com> | 2015-06-10 13:00:42 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@theqtcompany.com> | 2015-10-07 10:34:43 +0000 |
| commit | d02645438bcabce074bb83d356d7018570186e19 (patch) | |
| tree | 972880281587f73b2e4e61088a16e0f8500351fe /tests/auto/opengl | |
| parent | 9ff6d513e41e8a3ccb5d36fc8f8b2d677adff91d (diff) | |
Autotests: skip three steps from tst_qglthreads
Change-Id: I38fb7ae94585a0d4dc2bd55085812ad200ea6159
Task-number: QTBUG-46446
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
Diffstat (limited to 'tests/auto/opengl')
| -rw-r--r-- | tests/auto/opengl/qglthreads/qglthreads.pro | 2 | ||||
| -rw-r--r-- | tests/auto/opengl/qglthreads/tst_qglthreads.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index 27b097f267..ab8bda741e 100644 --- a/tests/auto/opengl/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro @@ -11,4 +11,4 @@ x11 { } -win32:CONFIG+=insignificant_test # QTBUG-28264 + diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index ff5a18dedb..7b7064529f 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -702,6 +702,9 @@ private: */ void tst_QGLThreads::painterOnGLWidgetInThread() { + //QTBUG-46446 tst_qglthreads is unstable on windows 7 + if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive)) + QSKIP("Doesn't work on this platform. QTBUG-46446"); if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) QSKIP("No platformsupport for ThreadedOpenGL"); if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || @@ -746,6 +749,9 @@ void tst_QGLThreads::painterOnPixmapInThread() */ void tst_QGLThreads::painterOnPboInThread() { + //QTBUG-46446 tst_qglthreads is unstable on windows 7 + if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive)) + QSKIP("Doesn't work on this platform. QTBUG-46446"); if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) QSKIP("No platformsupport for ThreadedOpenGL"); if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || @@ -773,6 +779,9 @@ void tst_QGLThreads::painterOnPboInThread() */ void tst_QGLThreads::painterOnFboInThread() { + //QTBUG-46446 tst_qglthreads is unstable on windows 7 + if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive)) + QSKIP("Doesn't work on this platform. QTBUG-46446"); if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) QSKIP("No platformsupport for ThreadedOpenGL"); if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) || |