From f3939d943ed132eaf3daead797d961c3ffbc31a5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 24 May 2015 16:30:05 +0200 Subject: Blacklist and skip various tests that are flakey They didn't show up in the "old" CI runs because they usually pass the second time they are executed - which the testrunner does. The new CI doesn't do that anymore, instead we now mark those tests explicitly and will track their record of passing and failing in the new metrics database. Change-Id: Id34dd6f792f38995b07b6fec88f833df64de2f8b Reviewed-by: Lars Knoll --- tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST | 4 ++++ tests/auto/corelib/kernel/qeventloop/BLACKLIST | 2 ++ tests/auto/corelib/kernel/qobject/BLACKLIST | 2 ++ tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST | 3 +++ tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp | 3 +++ 5 files changed, 14 insertions(+) create mode 100644 tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST create mode 100644 tests/auto/corelib/kernel/qeventloop/BLACKLIST create mode 100644 tests/auto/corelib/kernel/qobject/BLACKLIST create mode 100644 tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST (limited to 'tests/auto/corelib/kernel') diff --git a/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST b/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST new file mode 100644 index 0000000000..00be65751b --- /dev/null +++ b/tests/auto/corelib/kernel/qeventdispatcher/BLACKLIST @@ -0,0 +1,4 @@ +[sendPostedEvents] +windows +[registerTimer] +windows diff --git a/tests/auto/corelib/kernel/qeventloop/BLACKLIST b/tests/auto/corelib/kernel/qeventloop/BLACKLIST new file mode 100644 index 0000000000..6ea6314b0a --- /dev/null +++ b/tests/auto/corelib/kernel/qeventloop/BLACKLIST @@ -0,0 +1,2 @@ +[testQuitLock] +windows diff --git a/tests/auto/corelib/kernel/qobject/BLACKLIST b/tests/auto/corelib/kernel/qobject/BLACKLIST new file mode 100644 index 0000000000..0887a73b4c --- /dev/null +++ b/tests/auto/corelib/kernel/qobject/BLACKLIST @@ -0,0 +1,2 @@ +[moveToThread] +windows diff --git a/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST b/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST new file mode 100644 index 0000000000..e68bf84268 --- /dev/null +++ b/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST @@ -0,0 +1,3 @@ +[unexpectedDisconnection] +windows +osx diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index c7011dbc04..9c856c9d0f 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -383,6 +383,9 @@ void tst_QTimer::deleteLaterOnQTimer() void tst_QTimer::moveToThread() { +#if defined(Q_OS_WIN32) + QSKIP("Does not work reliably on Windows :("); +#endif QTimer ti1; QTimer ti2; ti1.start(MOVETOTHREAD_TIMEOUT); -- cgit v1.2.1