Fix XPASS on Ubuntu Precise Pangolin.

Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf
Reviewed-by: Tobias Koenig
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 4f51202..30ce70b 100644 (file)
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -13,4 +13,6 @@ SOURCES += tst_qpaintervideosurface.cpp
 QT+=widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
+linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = precise ]"):DEFINES+=UBUNTU_PRECISE_PANGOLIN
+
 win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28542

diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index fd30628..e9e71ed 100644 (file)
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -1039,7 +1039,7 @@ void tst_QPainterVideoSurface::shaderPresent()
 
     QVideoSurfaceFormat formatA(frameSizeA, pixelFormatA);
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && !defined(UBUNTU_PRECISE_PANGOLIN)
     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);