1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Promote specific scoping for blacklist-file comments

Browse Source 
A standalone comment added before a test case or keyword will
be confusing once more test cases and keywords are added, as
the comment likely doesn't apply to those added lines.

Change-Id: I4e36c1c2ae4547bcffa9df817cd53c64cf66defb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 2f939540c7a7dac262dd61210351cbd24545ee83)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-06-07 10:35:43 +02:00 committed by Qt Cherry-pick Bot
parent ae44b283a9
commit 18375f3bff
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/testlib/qtestblacklist.cpp
View File

@ -23,7 +23,9 @@ using namespace Qt::StringLiterals;
Blank lines and everything after # is simply ignored. An initial #-line Blank lines and everything after # is simply ignored. An initial #-line
referring to this documentation is kind to readers. Comments can also be used referring to this documentation is kind to readers. Comments can also be used
to indicate the reasons for ignoring particular cases. to indicate the reasons for ignoring particular cases. Please scope comments
to keywords if possible, to avoid confusion when additional keywords or tests
cases are added later.
Each blacklist line is interpreted as a list of keywords in an AND-relationship. 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. To blacklist a test for multiple platforms (OR-relationship), use separate lines.
@ -53,18 +55,15 @@ using namespace Qt::StringLiterals;
# Test doesn't work on QNX at all # Test doesn't work on QNX at all
qnx qnx
# QTBUG-12345
[testFunction] [testFunction]
linux linux # QTBUG-12345
windows 64bit windows 64bit # QTBUG-12345
# Flaky in COIN on macOS, not reproducible by developers
[testSlowly] [testSlowly]
macos ci macos ci # Flaky in COIN on macOS, not reproducible by developers
# Needs basic C++11 support
[testfunction2:testData] [testfunction2:testData]
msvc-2010 msvc-2010 # Needs basic C++11 support
[getFile:withProxy SSL:localhost] [getFile:withProxy SSL:localhost]
android android
@ -75,9 +74,8 @@ using namespace Qt::StringLiterals;
For example, to blacklist a QML test on RHEL 7.6: For example, to blacklist a QML test on RHEL 7.6:
# QTBUG-12345
[Button::test_display:TextOnly] [Button::test_display:TextOnly]
ci rhel-7.6 ci rhel-7.6 # QTBUG-12345
Keys are lower-case. Distribution name and version are supported if Keys are lower-case. Distribution name and version are supported if
QSysInfo's productType() and productVersion() return them. QSysInfo's productType() and productVersion() return them.