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

Document the ci key in the BLACKLIST file format

Browse Source 
Rearranged existing top-level example to let the ci example make some
kind of sense.

Change-Id: I0a5dd6270aef419c8a33d390c801460f23e10667
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2017-05-29 10:57:42 +02:00
parent 3e0bf04d7b
commit 0caaf33d2f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/testlib/qtestblacklist.cpp
View File

@ -58,9 +58,10 @@ QT_BEGIN_NAMESPACE
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.
A key names a platform, O/S, distribution, tool-chain or architecture; a ! The key "ci" applies only when run by COIN. Other keys name platforms,
prefix reverses what it checks. A version, joined to a key (at present, only operating systems, distributions, tool-chains or architectures; a ! prefix
for distributions and for msvc) with a hyphen, limits the key to the specific reverses what it checks. A version, joined to a key (at present, only for
distributions and for msvc) with a hyphen, limits the key to the specific
version. A keyword line matches if every key on it applies to the present version. A keyword line matches if every key on it applies to the present
run. Successive lines are alternate conditions for ignoring a test. run. Successive lines are alternate conditions for ignoring a test.
@ -70,13 +71,18 @@ QT_BEGIN_NAMESPACE
Subsequent lines give conditions for ignoring this test. Subsequent lines give conditions for ignoring this test.
# See qtbase/src/testlib/qtestblacklist.cpp for format # See qtbase/src/testlib/qtestblacklist.cpp for format
osx # Test doesn't work on QNX at all
qnx
# QTBUG-12345 # QTBUG-12345
[testFunction] [testFunction]
linux linux
windows 64bit windows 64bit
# Flaky in COIN on macOS, not reproducible by developers
[testSlowly]
ci osx
# Needs basic C++11 support # Needs basic C++11 support
[testfunction2:testData] [testfunction2:testData]
msvc-2010 msvc-2010