diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-14 11:24:35 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-22 09:10:31 +0000 |
| commit | 5c13acd3c953dd9f8fd9b17d7a1be7c3f5e4004f (patch) | |
| tree | 80916401b16f3f43b78f230a3aac259929f86340 | |
| parent | 07cb03c798010662eb80588132e765d0ba1f2e0e (diff) | |
Ignore tst_qglbuffer vertexBuffer and indexBuffer failures with Angle
Together with the Angle version we're shipping in, the results we're
getting from the read do not match. The test works in Qt 5.9 and
onwards, and it passes in 5.6 with QT_OPENGL=software.
Task-number: QTQAINFRA-1199
Change-Id: I92eff44441b0f03dc5126467dd13ed46648b6abd
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp index f96e3514a7..a5519c75ab 100644 --- a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp +++ b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp @@ -34,6 +34,7 @@ #include <QtTest/QtTest> #include <QtOpenGL/qgl.h> #include <QtOpenGL/qglbuffer.h> +#include <QOpenGLContext> class tst_QGLBuffer : public QObject { @@ -84,6 +85,12 @@ void tst_QGLBuffer::testBuffer(QGLBuffer::Type type) QGLWidget w; w.makeCurrent(); +#if defined(Q_OS_WINDOWS) + if (w.context()->contextHandle()->isOpenGLES()) { + QSKIP("Unfortunately Angle in Qt 5.6 does not support this test -- QTQAINFRA-1199"); + } +#endif + // Create the local object, but not the buffer in the server. QGLBuffer buffer(type); QCOMPARE(buffer.usagePattern(), QGLBuffer::StaticDraw); |