summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-03-12 13:07:35 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 18:13:37 +0100
commitbb2d95ce4321d119621961aa1c383e614ececa0a (patch)
treebe4de9983f1a9f18e3aa486b136f1f17796bdc1f
parentd7c22276516094d1d02310db73f23dc71af4738f (diff)
Skip more QScroller tests on Mac, they are all flakey
Task-number: QTBUG-29950 Change-Id: Ieda94dbcab3d75678597544a029c5ca6d2dc8226 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--tests/auto/widgets/util/qscroller/tst_qscroller.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 0acda27f17..beb1d27620 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -365,6 +365,9 @@ void tst_QScroller::scrollerProperties()
void tst_QScroller::scrollTo()
{
+#ifdef Q_OS_MAC
+ QSKIP("Flakey test - https://bugreports.qt-project.org/browse/QTBUG-29950");
+#endif
{
tst_QScrollerWidget *sw = new tst_QScrollerWidget();
sw->scrollArea = QRectF( 0, 0, 1000, 1000 );
@@ -391,7 +394,9 @@ void tst_QScroller::scrollTo()
void tst_QScroller::scroll()
{
+#ifdef Q_OS_MAC
QSKIP("Flakey test - https://bugreports.qt-project.org/browse/QTBUG-30133");
+#endif
#ifndef QT_NO_GESTURES
// -- good case. normal scroll
tst_QScrollerWidget *sw = new tst_QScrollerWidget();
@@ -434,6 +439,9 @@ void tst_QScroller::scroll()
void tst_QScroller::overshoot()
{
+#ifdef Q_OS_MAC
+ QSKIP("Flakey test - https://bugreports.qt-project.org/browse/QTBUG-29950");
+#endif
#ifndef QT_NO_GESTURES
tst_QScrollerWidget *sw = new tst_QScrollerWidget();
sw->scrollArea = QRectF(0, 0, 1000, 1000);