From bb5757f0cd7903c04f5d49fb0bf743b896639956 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 1 Jul 2020 11:00:00 +0200 Subject: 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 Reviewed-by: Joerg Bornemann --- src/testlib/qtestblacklist.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/testlib/qtestblacklist.cpp') 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 keywords() #ifdef QT_BUILD_INTERNAL << "developer-build" #endif + +#ifdef QT_CMAKE_BUILD + << "cmake" +#endif ; #if QT_CONFIG(properties) -- cgit v1.2.3