diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-02-19 11:49:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 13:21:43 +0100 |
| commit | df2c324364ac08255a1fe2c8d3b94a822551ac5a (patch) | |
| tree | 0289e9800277a2705cab88545ed2703939c06df0 | |
| parent | 4fc974fdefebb92bc22d87700c40d00a019e04a6 (diff) | |
Remove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresent
These tests seem to be passing consistently now, so this is an attempt
to reenable them on Linux, as right now passing them on some Linux
machines in CI is causing failures.
Task-number: QTBUG-26320
Change-Id: I4f2b219dc694e24d8beee651919f3b805922bde1
Reviewed-by: Tobias Koenig
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 2ff3e92b7..71656a070 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -1039,12 +1039,6 @@ void tst_QPainterVideoSurface::shaderPresent() QVideoSurfaceFormat formatA(frameSizeA, pixelFormatA); -#ifdef Q_OS_LINUX - QEXPECT_FAIL("ARBfp: rgb32 -> argb32", "QTBUG-26320 - Failing for linux versions", Abort); - QEXPECT_FAIL("ARBfp: rgb32 -> rgb565", "QTBUG-26320 - Failing for linux versions", Abort); - QEXPECT_FAIL("ARBfp: rgb32 -> yuv420p", "QTBUG-26320 - Failing for linux versions", Abort); - QEXPECT_FAIL("ARBfp: yv12 -> rgb32", "QTBUG-26320 - Failing for linux versions", Abort); -#endif QVERIFY(surface.start(formatA)); QCOMPARE(surface.isActive(), true); QCOMPARE(surface.isReady(), true); |