diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2017-05-29 10:57:42 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-08 13:36:25 +0000 |
commit | 0caaf33d2f089ad70b8d8a6952dc2a5f44505acc (patch) | |
tree | 547dde20e43a9f24b23613932372c18b72ee4467 /src/testlib | |
parent | 3e0bf04d7b069a3b9dc7242ece40658603c15f14 (diff) |
Document the ci key in the BLACKLIST file format
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>
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestblacklist.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 0ebc800fe1..dbf79575a8 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -58,9 +58,10 @@ QT_BEGIN_NAMESPACE referring to this documentation is kind to readers. Comments can also be used to indicate the reasons for ignoring particular cases. - A key names a platform, O/S, distribution, tool-chain or architecture; a ! - prefix 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 + The key "ci" applies only when run by COIN. Other keys name platforms, + operating systems, distributions, tool-chains or architectures; a ! prefix + 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 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. # See qtbase/src/testlib/qtestblacklist.cpp for format - osx + # Test doesn't work on QNX at all + qnx # QTBUG-12345 [testFunction] linux windows 64bit + # Flaky in COIN on macOS, not reproducible by developers + [testSlowly] + ci osx + # Needs basic C++11 support [testfunction2:testData] msvc-2010 |