1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make skipping of test consistent.

Browse Source 
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>
This commit is contained in:
Frederik Gladhorn 2012-11-23 17:39:23 +01:00 committed by The Qt Project
parent 5223e7eb27
commit e4e8578c35
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,5 +10,5 @@ x11 {
LIBS += $$QMAKE_LIBS_X11 LIBS += $$QMAKE_LIBS_X11
} }
win32|linux-*:CONFIG+=insignificant_test # QTBUG-22560 CONFIG+=insignificant_test # QTBUG-22560
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

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

@ -140,11 +140,6 @@ public:
void tst_QGLThreads::swapInThread() 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; QGLFormat format;
format.setSwapInterval(1); format.setSwapInterval(1);
ForegroundWidget widget(format); ForegroundWidget widget(format);
@ -250,11 +245,6 @@ private:
void tst_QGLThreads::textureUploadInThread() 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; TextureDisplay display;
CreateAndUploadThread thread(&display); CreateAndUploadThread thread(&display);
@ -426,10 +416,6 @@ void tst_QGLThreads::renderInThread_data()
void tst_QGLThreads::renderInThread() 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, resize);
QFETCH(bool, update); QFETCH(bool, update);
@ -635,10 +621,6 @@ private:
*/ */
void tst_QGLThreads::painterOnGLWidgetInThread() 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) || if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 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() 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 #ifdef Q_WS_X11
QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers."); QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.");
#endif #endif
@ -682,10 +660,6 @@ void tst_QGLThreads::painterOnPixmapInThread()
*/ */
void tst_QGLThreads::painterOnPboInThread() 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) || if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 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() 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) || if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) { (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0."); QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");