diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-01-04 13:51:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 09:12:53 +0100 |
| commit | c738512a571827e6070a10e4ee2f345ff5e7ff10 (patch) | |
| tree | 85f6b669a2ec436598ff0b5b3fda545d00818ed2 /tests | |
| parent | da0839735ca3d2ca5557f66f670fbe03d1617e6c (diff) | |
Apply expected failure to animated color changes.
Color mixing fails on Ubuntu 11.10 x64 platform, this change adds
expected failures for this platform only.
Task-number: QTBUG-23385
Change-Id: Iaf272735f3cea460a1cb3840ebefd5bd27b5bbfa
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro | 3 | ||||
| -rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro index d15e86cbd6..e13dbb974e 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro @@ -13,3 +13,6 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib + +# QTBUG-23385 - color mixing tests failing on Ubuntu 11.10 x64 +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC diff --git a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 075d29f9d9..c078ed416c 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -185,6 +185,9 @@ void tst_qdeclarativeanimations::simpleColor() QVERIFY(animation.isPaused()); animation.setCurrentTime(125); QVERIFY(animation.currentTime() == 125); +#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) + QEXPECT_FAIL("", "Fails on this platform - QTBUG-23385", Abort); +#endif QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1)); rect.setColor(QColor("green")); @@ -576,6 +579,9 @@ void tst_qdeclarativeanimations::mixedTypes() //rather inexact -- is there a better way? QVERIFY(myRect->x() > 100 && myRect->x() < 200); +#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) + QEXPECT_FAIL("", "Fails on this platform - QTBUG-23385", Continue); +#endif QVERIFY(myRect->color() != QColor("red") && myRect->color() != QColor("blue")); } } |