From 7d861db82b9f8204c2fdc3c12220dd03bdb7b255 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Wed, 15 Sep 2010 13:03:37 +0200 Subject: The test livelock of QTimer is now expected to work Following the patch e3801c20bd3626c3c9c9fac110ee2f9e4269e3c8 of Olivier, this test is working for Mac as well. Reviewed-by: Olivier Goffart --- tests/auto/qtimer/tst_qtimer.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index 4ed42cf..73b3452 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -271,10 +271,7 @@ void tst_QTimer::livelock() QCOMPARE(tester.timeoutsForFirst, 1); QCOMPARE(tester.timeoutsForExtra, 0); QCOMPARE(tester.timeoutsForSecond, 1); -#if defined(Q_OS_MAC) - QEXPECT_FAIL("zero timer", "Posted events source are handled AFTER timers", Continue); - QEXPECT_FAIL("non-zero timer", "Posted events source are handled AFTER timers", Continue); -#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) if (QSysInfo::WindowsVersion < QSysInfo::WV_XP) QEXPECT_FAIL("non-zero timer", "Multimedia timers are not available on Windows 2000", Continue); #elif defined(Q_OS_WINCE) -- cgit v0.12