From 0caaf33d2f089ad70b8d8a6952dc2a5f44505acc Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 May 2017 10:57:42 +0200 Subject: Document the ci key in the BLACKLIST file format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rearranged existing top-level example to let the ci example make some kind of sense. Change-Id: I0a5dd6270aef419c8a33d390c801460f23e10667 Reviewed-by: Tor Arne Vestbø --- src/testlib/qtestblacklist.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/testlib') 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 -- cgit v1.2.3