Flatten version-specific blacklisting on macOS to all macOS versions

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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