diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-08 16:03:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 14:05:19 +0100 |
| commit | f7d5d07aceac5314e052028618bdaea2f7ffee9f (patch) | |
| tree | a7771e3438d4ce9d0deeb850183bedcc93d20743 /tests | |
| parent | 2fd3dbb00cc69c71d9d32d1103f095134ae9ce9d (diff) | |
Re-enabled passing tests in tst_qopengl
To increase the effective test coverage, this patch
re-enables the tst_qopengl test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: Ifa9ccab81efb1577767465c150fc64a9d9e3f8e0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/qopengl/qopengl.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/qopengl/tst_qopengl.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro index f281c6c439..0cc574a5bc 100644 --- a/tests/auto/gui/qopengl/qopengl.pro +++ b/tests/auto/gui/qopengl/qopengl.pro @@ -7,5 +7,3 @@ TARGET = tst_qopengl QT += gui gui-private core-private testlib SOURCES += tst_qopengl.cpp - -CONFIG += insignificant_test diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index ebff56fd5c..479c1c8e2e 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -327,6 +327,10 @@ void tst_QOpenGL::fboSimpleRendering() // buffer is actually missing. But that's probably ok anyway. void tst_QOpenGL::fboRendering() { +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(__x86_64__) + QSKIP("QTBUG-22617"); +#endif + QWindow window; window.setGeometry(0, 0, 10, 10); window.create(); @@ -391,6 +395,10 @@ void tst_QOpenGL::fboHandleNulledAfterContextDestroyed() void tst_QOpenGL::openGLPaintDevice() { +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(__x86_64__) + QSKIP("QTBUG-22617"); +#endif + QWindow window; window.setGeometry(0, 0, 128, 128); window.create(); |