whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autotests: skip three steps from tst_qglthreads 

Change-Id: I38fb7ae94585a0d4dc2bd55085812ad200ea6159
Task-number: QTBUG-46446
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
bb10
Jani Vähäkangas 2015-06-10 13:00:42 +03:00 committed by Tony Sarajärvi
parent 9ff6d513e4
commit d02645438b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/opengl/qglthreads/qglthreads.pro
View File

@ -11,4 +11,4 @@ x11 {
}
win32:CONFIG+=insignificant_test # QTBUG-28264

9
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
View File

@ -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) ||