From df2c324364ac08255a1fe2c8d3b94a822551ac5a Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 19 Feb 2013 11:49:20 +0100 Subject: [PATCH] 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 --- tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 2ff3e92..71656a0 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); -- 2.7.4