diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-18 12:11:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 13:57:14 +0100 |
| commit | c64db5dfdecb64f4e9b3826da9ddb1dfdfdadc42 (patch) | |
| tree | 2f928d6b2e5c2c18bcaa51a87bfc59176b8fef1c /tests | |
| parent | af359028bb3d3897a659e298394b25be1966bdde (diff) | |
Fix XPASS on Ubuntu Precise Pangolin.
Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf
Reviewed-by: Tobias Koenig
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro | 2 | ||||
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro index 4f5120245..30ce70b79 100644 --- 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 fd3062874..e9e71edff 100644 --- 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); |