From 25a743d84808d8d157fee69ed54fc9ac976c96ac Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Tue, 11 Oct 2011 17:53:10 +1000 Subject: [PATCH] Remove insignificant test status and explicitly mark failing test. Task-number: QTBUG-21946 Change-Id: If1837a23041b52dc1f148821f483281975626d79 Reviewed-on: http://codereview.qt-project.org/6374 Sanity-Review: Qt Sanity Bot Reviewed-by: Martin Jones --- tests/auto/declarative/qsgtextinput/qsgtextinput.pro | 1 - tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/auto/declarative/qsgtextinput/qsgtextinput.pro b/tests/auto/declarative/qsgtextinput/qsgtextinput.pro index b949247..8c7d67c 100644 --- a/tests/auto/declarative/qsgtextinput/qsgtextinput.pro +++ b/tests/auto/declarative/qsgtextinput/qsgtextinput.pro @@ -6,5 +6,4 @@ SOURCES += tst_qsgtextinput.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" -CONFIG += insignificant_test QT += core-private gui-private v8-private declarative-private opengl-private testlib diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp index b0f8eaf..26638c1 100644 --- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp +++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp @@ -266,7 +266,6 @@ void tst_qsgtextinput::width() QVERIFY(textinputObject != 0); int delta = abs(int(int(textinputObject->width()) - metricWidth)); - QEXPECT_FAIL("", "QTBUG-21689", Abort); QVERIFY(delta <= 3.0); // As best as we can hope for cross-platform. delete textinputObject; @@ -2097,6 +2096,7 @@ void tst_qsgtextinput::openInputPanel() QVERIFY(!input->hasActiveFocus()); qDebug() << &input << qApp->inputPanel()->inputItem(); QCOMPARE(qApp->inputPanel()->inputItem(), static_cast(0)); + QEXPECT_FAIL("", "QTBUG-21946", Abort); QCOMPARE(qApp->inputPanel()->visible(), false); // input panel should open on focus -- 2.7.4