diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-10-25 22:05:58 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-30 08:39:29 (GMT) |
| commit | aa217d0d09ed1c3918528a0137982da0c38b7a2e (patch) | |
| tree | 1e0e5c1037e51fea87bba67c7f0db68929441d45 | |
| parent | edb225f44c32a7986700d3a935476b62a1c4e84d (diff) | |
| download | Qt-aa217d0d09ed1c3918528a0137982da0c38b7a2e.zip Qt-aa217d0d09ed1c3918528a0137982da0c38b7a2e.tar.gz Qt-aa217d0d09ed1c3918528a0137982da0c38b7a2e.tar.bz2 | |
tst_qaccessibility: narrow QEXPECT_FAIL in textEditTest
tst_QAccessibility::textEditTest no longer fails on Ubuntu 10.04 in CI.
Restrict the QEXPECT_FAIL to only those platforms where it is known to
fail.
Task-number: QTBUG-26499
Change-Id: Ia12e81dbc0a94464c9916bedb4d29065781285c5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | tests/auto/qaccessibility/qaccessibility.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qaccessibility/tst_qaccessibility.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro index 71d6f95..af21d7c 100644 --- a/tests/auto/qaccessibility/qaccessibility.pro +++ b/tests/auto/qaccessibility/qaccessibility.pro @@ -2,6 +2,8 @@ load(qttest_p4) requires(contains(QT_CONFIG,accessibility)) SOURCES += tst_qaccessibility.cpp +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-26499 + unix:!mac:LIBS+=-lm contains(QT_CONFIG, qt3support): QT += qt3support diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index d20899f..ed69901 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -2744,7 +2744,7 @@ void tst_QAccessibility::textEditTest() QCOMPARE(iface->text(QAccessible::Value, 6), QString()); QCOMPARE(iface->textInterface()->characterCount(), 31); QFontMetrics fm(edit.font()); -#ifdef Q_WS_X11 +#if defined(Q_WS_X11) && defined(UBUNTU_ONEIRIC) QEXPECT_FAIL("", "QTBUG-26499", Abort); #endif QCOMPARE(iface->textInterface()->characterRect(0, QAccessible2::RelativeToParent).size(), QSize(fm.width("h"), fm.height())); |