summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-04-12 12:23:46 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-13 10:46:34 +0200
commit87548de2ef2313f628d1ddf10ae0cebea74838b2 (patch)
tree512e5e51675ce15829a5a9b8a46647d59484a2e6
parent9fd2edb6da5f1f6d644cd7c3f35aebe3e88beee2 (diff)
downloadqtbase-87548de2ef2313f628d1ddf10ae0cebea74838b2.tar.gz
test: Don't mark tst_qscrollbar as insignificant on Mac OS X
Just XFAIL the failing test instead of ignoring the whole test. Task-number: QTBUG-25272 Change-Id: Iedca9913032f13c6610b049a0313c9e4336216e0 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro2
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
index e9436eccdc..2863dd2034 100644
--- a/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
+++ b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
@@ -2,5 +2,3 @@ CONFIG += testcase
TARGET = tst_qscrollbar
QT += widgets testlib
SOURCES += tst_qscrollbar.cpp
-
-mac*:CONFIG+=insignificant_test
diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
index ec48c2b680..f568322ab7 100644
--- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
+++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
@@ -99,6 +99,9 @@ void tst_QScrollBar::scrollSingleStep()
QTest::mouseClick(testWidget, Qt::LeftButton, Qt::NoModifier, QPoint(sr.x(), sr.y()));
QTest::qWait(510); // initial delay is 500 for setRepeatAction
disconnect(testWidget, SIGNAL(actionTriggered(int)), 0, 0);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-25272", Abort);
+#endif
QCOMPARE(testWidget->value(), testWidget->singleStep());
}