diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-01 11:00:00 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-01 14:55:26 +0200 |
| commit | bb5757f0cd7903c04f5d49fb0bf743b896639956 (patch) | |
| tree | 7706d08a7f022b98259375d0f494d747fd03352b /src/testlib/qtestblacklist.cpp | |
| parent | ab6861b01ff9c14fd1648cb725da17d1ebf3faea (diff) | |
CMake: Add "cmake" keyword for test blacklisting
Certain tests fail only on CMake configurations. We need the
capability to ignore these failures, without removing the
qmake-built-Qt coverage for now.
The keyword is enabled when Qt is built with CMake. So it doesn't
matter if the final test is built with CMake or qmake.
Task-number: QTBUG-85364
Change-Id: I157fe3d9254b589ef1e84022c01f4487ff834d27
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index d4165fb240..6695605f12 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -58,7 +58,8 @@ QT_BEGIN_NAMESPACE referring to this documentation is kind to readers. Comments can also be used to indicate the reasons for ignoring particular cases. - The key "ci" applies only when run by COIN. Other keys name platforms, + 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 checks. A version, joined to a key (at present, only for distributions and for msvc) with a hyphen, limits the key to the specific @@ -164,6 +165,10 @@ static QSet<QByteArray> keywords() #ifdef QT_BUILD_INTERNAL << "developer-build" #endif + +#ifdef QT_CMAKE_BUILD + << "cmake" +#endif ; #if QT_CONFIG(properties) |