From dcb06c7880b89530f3fbbb6bbe519d203dce517d Mon Sep 17 00:00:00 2001 From: Milla Pohjanheimo Date: Tue, 5 Apr 2016 11:58:35 +0300 Subject: Skipping testRecent() and testFrequent() tests from Win8.1 onwards Interaction with Windows taskbar probably is unstable and it makes the tests fail randomly. Extending QSKIP to affect Win8.1 also. Change-Id: I757a01fb84fe0b585ef076c423c04962d2a91749 Reviewed-by: Friedemann Kleint --- tests/auto/qwinjumplist/tst_qwinjumplist.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp index cf50b8d..26f382e 100644 --- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp +++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp @@ -55,8 +55,8 @@ static inline QByteArray msgFileNameMismatch(const QString &f1, const QString &f void tst_QWinJumpList::testRecent() { - if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10) - QSKIP("QTBUG-48751: Recent items do not work on Windows 10", Continue); + if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS8_1) + QSKIP("QTBUG-48751: Recent items do not work on Windows 8.1 or 10", Continue); QScopedPointer jumplist(new QWinJumpList); QWinJumpListCategory *recent1 = jumplist->recent(); QVERIFY(recent1); @@ -104,8 +104,8 @@ void tst_QWinJumpList::testRecent() void tst_QWinJumpList::testFrequent() { - if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10) - QSKIP("QTBUG-48751: Frequent items do not work on Windows 10", Continue); + if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS8_1) + QSKIP("QTBUG-48751: Frequent items do not work on Windows 8.1 or 10", Continue); QScopedPointer jumplist(new QWinJumpList); QWinJumpListCategory *frequent1 = jumplist->frequent(); QVERIFY(frequent1); -- cgit v1.2.3