From 7c7731a8229a44050c02d33c7111e4d522909c1d Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Wed, 26 Feb 2025 14:48:37 +0100 Subject: [PATCH] tst_QScroller::overshoot(): improve diagnostic output, blacklist on mac Test is flaky on macOS. Use QCOMPARE_LT instead of QVERIFY(a < b). Blacklist on macOS. Task-number: QTBUG-134105 Pick-to: 6.9 6.8 Change-Id: I8f1274ad67bd9ead392ecd0f9c9b7a01dc3edb1e Reviewed-by: Volker Hilsheimer Reviewed-by: Fabian Kosmale --- tests/auto/widgets/util/qscroller/BLACKLIST | 3 +++ tests/auto/widgets/util/qscroller/tst_qscroller.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/widgets/util/qscroller/BLACKLIST b/tests/auto/widgets/util/qscroller/BLACKLIST index 3a91f24d51e..aadd5e052f1 100644 --- a/tests/auto/widgets/util/qscroller/BLACKLIST +++ b/tests/auto/widgets/util/qscroller/BLACKLIST @@ -6,3 +6,6 @@ macos # QTBUG-87409 [scrollTo] android + +[overshoot] +macos diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp index 825895f8937..b0a01c21be0 100644 --- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp +++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp @@ -488,7 +488,7 @@ void tst_QScroller::overshoot() QScrollerPrivate* priv = s1->d_func(); QVERIFY(priv->xSegments.size() == 1); auto& segment = priv->xSegments.head(); - QVERIFY(segment.startPos + segment.deltaPos < segment.stopPos); + QCOMPARE_LT(segment.startPos + segment.deltaPos, segment.stopPos); QTRY_COMPARE(s1->state(), QScroller::Inactive);