diff options
author | Andrew Knight <andrew.knight@digia.com> | 2014-08-07 15:44:50 +0300 |
---|---|---|
committer | Andrew Knight <andrew.knight@digia.com> | 2014-08-07 20:03:39 +0200 |
commit | 6b31418a1b5d9be47df5ed61747e8a5fb225acfa (patch) | |
tree | 3e902f1ca6d8c5c7992b6dbb5807a6d3229d5383 /tests/auto/quick/qquickitemlayer | |
parent | fa29df24bd2792f5eb64e4ff21a116b2c5f5384c (diff) |
Temporarily mark grab()/item.layer tests insignificant under ANGLE
This is to pass CI while the issue is being fixed.
Task-number: QTBUG-40649
Change-Id: I9b095ce0ce0a3c51956ab81d09975b6cc6ce3592
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickitemlayer')
-rw-r--r-- | tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index bd7b89b104..2bef45056f 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -138,6 +138,9 @@ tst_QQuickItemLayer::tst_QQuickItemLayer() void tst_QQuickItemLayer::layerSmooth() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); QImage fb = runTest("Smooth.qml"); @@ -157,6 +160,9 @@ void tst_QQuickItemLayer::layerSmooth() void tst_QQuickItemLayer::layerEnabled() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); QImage fb = runTest("Enabled.qml"); @@ -173,6 +179,9 @@ void tst_QQuickItemLayer::layerEnabled() void tst_QQuickItemLayer::layerMipmap() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer) QSKIP("Mipmapping does not work with the Mesa Software Rasterizer."); QImage fb = runTest("Mipmap.qml"); @@ -187,6 +196,9 @@ void tst_QQuickItemLayer::layerMipmap() void tst_QQuickItemLayer::layerEffect() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); QImage fb = runTest("Effect.qml"); @@ -201,6 +213,9 @@ void tst_QQuickItemLayer::layerEffect() // a shader that pads transparent to blue. Everything else is red. void tst_QQuickItemLayer::layerSourceRect() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); @@ -222,6 +237,9 @@ void tst_QQuickItemLayer::layerSourceRect() // directly in a stand alone ShaderEffect void tst_QQuickItemLayer::layerIsTextureProvider() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); QImage fb = runTest("TextureProvider.qml"); @@ -254,6 +272,9 @@ void tst_QQuickItemLayer::layerVisibility_data() void tst_QQuickItemLayer::layerVisibility() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); @@ -302,6 +323,9 @@ void tst_QQuickItemLayer::layerZOrder_data() void tst_QQuickItemLayer::layerZOrder() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); @@ -336,6 +360,9 @@ void tst_QQuickItemLayer::changeZOrder_data() void tst_QQuickItemLayer::changeZOrder() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); @@ -404,6 +431,9 @@ void tst_QQuickItemLayer::disableLayer() void tst_QQuickItemLayer::changeSamplerName() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); QImage fb = runTest("SamplerNameChange.qml"); @@ -412,6 +442,9 @@ void tst_QQuickItemLayer::changeSamplerName() void tst_QQuickItemLayer::itemEffect() { +#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE) + QSKIP("QTBUG-40649"); +#endif if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0)) QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly."); QImage fb = runTest("ItemEffect.qml"); |