1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
index 49c10c6a24..6f65932e5f 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
+++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
@@ -205,10 +205,26 @@ void tst_QEventDispatcher::registerTimer()
     QVERIFY(timers.foundCoarse());
     QVERIFY(timers.foundVeryCoarse());
 
+#ifdef Q_OS_DARWIN
+    /*
+        We frequently experience flaky failures on macOS. Assumption is that this is
+        due to undeterministic VM scheduling, making us process events for significantly
+        longer than expected and resulting in timers firing in undefined order.
+        To detect this condition, we use a QElapsedTimer, and skip the test.
+    */
+    QElapsedTimer elapsedTimer;
+    elapsedTimer.start();
+#endif
+
     // process events, waiting for the next event... this should only fire the precise timer
     receivedEventType = -1;
     timerIdFromEvent = -1;
     QTRY_COMPARE_WITH_TIMEOUT(receivedEventType, int(QEvent::Timer), PreciseTimerInterval * 2);
+#ifdef Q_OS_DARWIN
+    if (timerIdFromEvent != timers.preciseTimerId()
+        && elapsedTimer.elapsed() > PreciseTimerInterval * 3)
+        QSKIP("Ignore flaky test behavior due to VM scheduling on macOS");
+#endif
     QCOMPARE(timerIdFromEvent, timers.preciseTimerId());
     // now unregister it and make sure it's gone
     timers.unregister(timers.preciseTimerId());
@@ -223,6 +239,12 @@ void tst_QEventDispatcher::registerTimer()
     receivedEventType = -1;
     timerIdFromEvent = -1;
     QTRY_COMPARE_WITH_TIMEOUT(receivedEventType, int(QEvent::Timer), CoarseTimerInterval * 2);
+#ifdef Q_OS_DARWIN
+    if (timerIdFromEvent != timers.coarseTimerId()
+        && elapsedTimer.elapsed() > CoarseTimerInterval * 3)
+        QSKIP("Ignore flaky test behavior due to VM scheduling on macOS");
+#endif
+
     QCOMPARE(timerIdFromEvent, timers.coarseTimerId());
     // now unregister it and make sure it's gone
     timers.unregister(timers.coarseTimerId());