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>

diff --git a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro
index d15e86c..e13dbb9 100644 (file)
--- 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 075d29f..c078ed4 100644 (file)
--- 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"));
     }
 }