diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-01-22 13:04:53 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-01-22 13:11:25 +0100 |
commit | e8c33f9c98bcb0855fb837f967c2ef37773be93e (patch) | |
tree | 27c33cc9ec6fa3667b189173fcc9747f597da0c2 /tests/auto/qmltest | |
parent | 39c614bed375d67f796d1519ebd2997060f81a0b (diff) |
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: I166f845ae3701b1ff528a0c5bfe5fd23c018483e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'tests/auto/qmltest')
-rw-r--r-- | tests/auto/qmltest/animatedimage/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/qmltest/textedit/BLACKLIST | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qmltest/animatedimage/BLACKLIST b/tests/auto/qmltest/animatedimage/BLACKLIST index 3a5ed393ea..25eb7a7cff 100644 --- a/tests/auto/qmltest/animatedimage/BLACKLIST +++ b/tests/auto/qmltest/animatedimage/BLACKLIST @@ -1,2 +1,2 @@ [AnimatedImage::test_crashRaceCondition_replyFinished] -osx-10.13 +macos diff --git a/tests/auto/qmltest/textedit/BLACKLIST b/tests/auto/qmltest/textedit/BLACKLIST index e06cba3e8f..ac1ca6d8cf 100644 --- a/tests/auto/qmltest/textedit/BLACKLIST +++ b/tests/auto/qmltest/textedit/BLACKLIST @@ -1,6 +1,6 @@ # Blacklist for testing [TextEdit::test_textentry] -osx-10.12 +macos [TextEdit::test_textentry_char] -osx-10.12 +macos |