summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2022-11-18 15:06:18 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2022-11-18 19:25:20 +0100
commitcbe7cead44af8b64bf288b02f5eee396106cfbf0 (patch)
tree34902b76aa7eda9960fb6043875ed5d33fb53714 /src/testlib
parent554ba2c39bbede3b73671c8d8c7635377c4a8107 (diff)
Add note to blacklist documentation about how keywords relate
Fix up deprecated macOS keyword while we're at it. Change-Id: I6f6ba21bde161d3dd3ac6c243f1b5f7c16ef3228 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtestblacklist.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 2b6b759023..868971fc17 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -25,6 +25,9 @@ using namespace Qt::StringLiterals;
referring to this documentation is kind to readers. Comments can also be used
to indicate the reasons for ignoring particular cases.
+ Each blacklist line is interpreted as a list of keywords in an AND-relationship.
+ To blacklist a test for multiple platforms (OR-relationship), use separate lines.
+
The key "ci" applies only when run by COIN. The key "cmake" applies when Qt
is built using CMake. Other keys name platforms, operating systems,
distributions, tool-chains or architectures; a ! prefix reverses what it
@@ -57,7 +60,7 @@ using namespace Qt::StringLiterals;
# Flaky in COIN on macOS, not reproducible by developers
[testSlowly]
- ci osx
+ macos ci
# Needs basic C++11 support
[testfunction2:testData]