diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-08-07 20:55:42 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-08-07 20:03:32 +0200 |
| commit | fa29df24bd2792f5eb64e4ff21a116b2c5f5384c (patch) | |
| tree | b482e56b4eeca6475bf1c5f0f8dc7161c18c46ee /tests | |
| parent | 0a43c561891a46477c4e78f6a6d05fd9731ebb04 (diff) | |
Disable tests on failing ANGLE config
Task-number: QTBUG-40658
Change-Id: I9a00083213de4d31216813351a406ec460d146fa
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp b/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp index 79b80c5cfe..2676abb9eb 100644 --- a/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp +++ b/tests/auto/quick/qquickspritesequence/tst_qquickspritesequence.cpp @@ -117,6 +117,9 @@ void tst_qquickspritesequence::test_framerateAdvance() void tst_qquickspritesequence::test_jumpToCrash() { +#if defined(QT_OPENGL_ES_2_ANGLE) && _MSC_VER==1600 + QSKIP("QTBUG-40658"); +#endif QQuickView *window = new QQuickView(0); window->setSource(testFileUrl("crashonstart.qml")); diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 1455f8cfcb..7897f6d36a 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -876,6 +876,9 @@ static inline QByteArray msgNotLessThan(int n1, int n2) void tst_qquicktext::hAlignImplicitWidth() { +#if defined(QT_OPENGL_ES_2_ANGLE) && _MSC_VER==1600 + QSKIP("QTBUG-40658"); +#endif QQuickView view(testFileUrl("hAlignImplicitWidth.qml")); view.setFlags(view.flags() | Qt::WindowStaysOnTopHint); // Prevent being obscured by other windows. view.show(); |