AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flatten version-specific blacklisting on macOS to all macOS versions

Browse Source 
We don't know which versions these blacklistings actually apply on
unless we actually get macOS 10.14 and 10.15 into the CI and running
tests, so let's start with that, and then granularize the blacklists
after that.

Task-number: QTBUG-75786
Change-Id: Id79642afa50cb20efa2cd209286b6933918d3a4a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-01-22 12:34:26 +01:00
parent db81129240
commit 92918e567a
15 changed files with 47 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST
View File

@ -1,6 +1,6 @@
[finishWithUncontrolledAnimation] [finishWithUncontrolledAnimation]
windows-10 msvc-2015 windows-10 msvc-2015
osx-10.13 macos
[groupWithZeroDurationAnimations] [groupWithZeroDurationAnimations]
osx-10.13 macos

2
tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
View File

@ -1,3 +1,3 @@
[elapsed] [elapsed]
osx-10.13 macos
windows-10 windows-10

6
tests/auto/corelib/thread/qsemaphore/BLACKLIST
View File

@ -2,9 +2,7 @@
osx osx
[tryAcquireWithTimeout:0.2s] [tryAcquireWithTimeout:0.2s]
windows windows
osx-10.12 macos
osx-10.13
[tryAcquireWithTimeout:2s] [tryAcquireWithTimeout:2s]
windows windows
osx-10.12 macos
osx-10.13

3
tests/auto/corelib/tools/qtimeline/BLACKLIST
View File

@ -2,6 +2,5 @@
windows-10 msvc-2015 windows-10 msvc-2015
osx osx
[frameRate] [frameRate]
osx-10.12 macos
osx-10.13

4
tests/auto/gui/kernel/qwindow/BLACKLIST
View File

@ -2,10 +2,10 @@
opensuse-leap opensuse-leap
[positioning:default] [positioning:default]
linux linux
osx-10.12 ci macos ci
winrt winrt
[positioning:fake] [positioning:fake]
osx-10.12 ci macos ci
[modalWithChildWindow] [modalWithChildWindow]
# QTBUG-66851 # QTBUG-66851
# QTBUG-69160 # QTBUG-69160

40
tests/auto/network/access/qnetworkreply/BLACKLIST
View File

@ -49,21 +49,21 @@ windows-7sp1
windows-10 windows-10
osx osx
[backgroundRequest] [backgroundRequest]
osx-10.12 macos
[connectToIPv6Address] [connectToIPv6Address]
osx-10.12 macos
[deleteFromHttp] [deleteFromHttp]
osx-10.12 macos
[downloadProgress] [downloadProgress]
osx-10.12 macos
[encrypted] [encrypted]
osx-10.13 macos
[httpCanReadLine] [httpCanReadLine]
osx-10.12 macos
[httpRecursiveCreation] [httpRecursiveCreation]
osx osx
[httpWithNoCredentialUsage] [httpWithNoCredentialUsage]
osx-10.12 macos
[ignoreSslErrorsList] [ignoreSslErrorsList]
osx osx
[ignoreSslErrorsListWithSlot] [ignoreSslErrorsListWithSlot]
@ -71,27 +71,27 @@ osx
[ioGetFromBuiltinHttp] [ioGetFromBuiltinHttp]
osx osx
[ioGetFromHttp] [ioGetFromHttp]
osx-10.12 macos
[ioPostToHttpFromFile] [ioPostToHttpFromFile]
osx-10.13 macos
[ioPostToHttpFromSocketSynchronous] [ioPostToHttpFromSocketSynchronous]
osx osx
[ioPostToHttpUploadProgress] [ioPostToHttpUploadProgress]
osx osx
[ioPutToHttpFromFile] [ioPutToHttpFromFile]
osx-10.13 macos
[lastModifiedHeaderForHttp] [lastModifiedHeaderForHttp]
osx-10.12 macos
[multipartSkipIndices] [multipartSkipIndices]
osx-10.12 macos
[nestedEventLoops] [nestedEventLoops]
osx osx
[postToHttp] [postToHttp]
osx-10.12 macos
[postToHttpMultipart] [postToHttpMultipart]
osx-10.12 macos
[postToHttpSynchronous] [postToHttpSynchronous]
osx-10.12 macos
[postToHttps] [postToHttps]
osx osx
[postToHttpsMultipart] [postToHttpsMultipart]
@ -99,17 +99,17 @@ osx
[postToHttpsSynchronous] [postToHttpsSynchronous]
osx osx
[putGetDeleteGetFromHttp] [putGetDeleteGetFromHttp]
osx-10.12 macos
[putToHttpSynchronous] [putToHttpSynchronous]
osx-10.12 macos
[putToHttps] [putToHttps]
osx osx
[putToHttpsSynchronous] [putToHttpsSynchronous]
osx osx
[putWithRateLimiting] [putWithRateLimiting]
osx-10.13 macos
[qtbug13431replyThrottling] [qtbug13431replyThrottling]
osx-10.12 macos
[receiveCookiesFromHttp] [receiveCookiesFromHttp]
osx osx
[receiveCookiesFromHttpSynchronous] [receiveCookiesFromHttpSynchronous]
@ -119,7 +119,7 @@ osx
[sendCookiesSynchronous] [sendCookiesSynchronous]
osx osx
[sendCustomRequestToHttp] [sendCustomRequestToHttp]
osx-10.12 macos
[sslConfiguration] [sslConfiguration]
osx osx
[synchronousRequest] [synchronousRequest]

4
tests/auto/network/ssl/qsslsocket/BLACKLIST
View File

@ -3,9 +3,9 @@ windows
[spontaneousWrite] [spontaneousWrite]
windows-7sp1 windows-7sp1
[connectToHostEncrypted] [connectToHostEncrypted]
osx-10.13 macos
[setSslConfiguration] [setSslConfiguration]
windows-10 msvc-2015 windows-10 msvc-2015
windows-7sp1 windows-7sp1
[connectToHostEncryptedWithVerificationPeerName] [connectToHostEncryptedWithVerificationPeerName]
osx-10.13 macos

6
tests/auto/other/macnativeevents/BLACKLIST
View File

@ -19,7 +19,7 @@ osx
osx osx
[testMouseDragToNonClientArea] [testMouseDragToNonClientArea]
osx osx
osx-10.12 ci macos ci
# The following key tests fail after switching to synchronous # The following key tests fail after switching to synchronous
# expose events, and we don't know why yet. QTBUG-62042 # expose events, and we don't know why yet. QTBUG-62042
[testKeyPressOnToplevel] [testKeyPressOnToplevel]
@ -32,8 +32,8 @@ osx
osx osx
# QTQAINFRA-1292 # QTQAINFRA-1292
[testPushButtonPressRelease] [testPushButtonPressRelease]
osx-10.12 ci macos ci
# QTQAINFRA-1292 # QTQAINFRA-1292
[testModifierCtrlWithDontSwapCtrlAndMeta] [testModifierCtrlWithDontSwapCtrlAndMeta]
osx-10.12 ci macos ci

4
tests/auto/widgets/dialogs/qdialog/BLACKLIST
View File

@ -1,4 +1,4 @@
[snapToDefaultButton] [snapToDefaultButton]
osx-10.14 macos
[showFullScreen] [showFullScreen]
osx-10.13 ci macos ci

4
tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
View File

@ -1,4 +1,2 @@
[QTBUG4419_lineEditSelectAll] [QTBUG4419_lineEditSelectAll]
osx-10.12 macos
osx-10.14
osx-10.13

4
tests/auto/widgets/kernel/qwidget/BLACKLIST
View File

@ -24,9 +24,7 @@ opensuse-42.3
[childEvents] [childEvents]
macos macos
[renderInvisible] [renderInvisible]
osx-10.12 macos
osx-10.11
osx-10.14
[optimizedResizeMove] [optimizedResizeMove]
osx osx
[optimizedResize_topLevel] [optimizedResize_topLevel]

4
tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
View File

@ -1,4 +1,2 @@
[editingFinished] [editingFinished]
osx-10.12 macos
osx-10.14
osx-10.13

11
tests/auto/widgets/widgets/qmdiarea/BLACKLIST
View File

@ -2,15 +2,12 @@
ubuntu-16.04 ubuntu-16.04
rhel-7.6 rhel-7.6
opensuse-leap opensuse-leap
osx-10.11 macos
osx-10.13
ubuntu-18.04 ubuntu-18.04
osx-10.14 macos
rhel-7.4 rhel-7.4
osx-10.12 macos
opensuse-42.3 opensuse-42.3
[resizeTimer] [resizeTimer]
osx-10.12 macos
osx-10.14
osx-10.13

10
tests/auto/widgets/widgets/qmenu/BLACKLIST
View File

@ -1,14 +1,12 @@
[task258920_mouseBorder] [task258920_mouseBorder]
osx-10.14 macos
osx-10.13
[layoutDirection] [layoutDirection]
osx-10.12 macos
osx-10.13
# Fails when enabling synchronous expose events QTBUG-62092 # Fails when enabling synchronous expose events QTBUG-62092
[pushButtonPopulateOnAboutToShow] [pushButtonPopulateOnAboutToShow]
osx-10.13 macos
[tearOff] [tearOff]
osx-10.14 macos
[activeSubMenuPosition] [activeSubMenuPosition]
winrt winrt
[submenuTearOffDontClose] [submenuTearOffDontClose]

2
tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
View File

@ -1,2 +1,2 @@
[task176137_autoRepeatOfAction] [task176137_autoRepeatOfAction]
osx-10.13 macos