diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-08-03 16:25:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 06:47:32 +0200 |
| commit | 967b7097f74de0a0c4ddd00cf5f3e772f9d9fc90 (patch) | |
| tree | 70efd6fa29e45f604481363827ae238d97f9d3bb | |
| parent | 433eeb19be8f1b4219167ce1c205de4663534ce8 (diff) | |
Remove insignification from qdeclarativeimage test.
Prior to this change, the test had one stable XPASS on all CI platforms
except Ubuntu 10.04. Limit the QEXPECT_FAIL to that one platform and
make the test significant again.
Task-number: QTBUG-26787
Change-Id: Id6c9dfc9a8d6de149dbb739c3e8c6311ce903c39
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro index 33e4bf58..200c9d1f 100644 --- a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -16,5 +16,5 @@ symbian: { DEFINES += SRCDIR=\\\"$$PWD\\\" } -CONFIG+=insignificant_test # QTQAINFRA-428 +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"):DEFINES+=UBUNTU_LUCID # QTBUG-26787 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 65963daa..f05d5390 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -332,7 +332,9 @@ void tst_qdeclarativeimage::mirror() p_e.drawPixmap(QRect(0, 0, width, height), srcPixmap, QRect(0, 0, srcPixmap.width(), srcPixmap.height())); break; case QDeclarativeImage::PreserveAspectFit: - QEXPECT_FAIL("", "QTBUG-19538", Continue); +#if defined(UBUNTU_LUCID) + QEXPECT_FAIL("", "QTBUG-26787", Continue); +#endif p_e.drawPixmap(QRect(25, 0, width / (width/height), height), srcPixmap, QRect(0, 0, srcPixmap.width(), srcPixmap.height())); break; case QDeclarativeImage::PreserveAspectCrop: |