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

Revert "tst_qmetatype: Temporarily disable expensive tests on QNX"

Browse Source 
This reverts commit 925ad7802470ab9b4fd1cce51548ccc5182eb4cc.

Reason for revert: Meanwhile, the QNX VM has been assigned more
resources, and the offending test function been split. Re-enable the
test on QNX, to get back to previous test coverage.

Fixes: QTQAINFRA-4669
Change-Id: Ib085fbfa7e0d8445f007d1a9346cee3113620720
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 9440c1a1fccc8962939a837cb2b81cb3584872f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2021-12-14 13:07:09 +00:00 committed by Qt Cherry-pick Bot
parent 17ce6620ec
commit fd02b117d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h
View File

@ -48,11 +48,11 @@ struct MessageHandlerCustom : public MessageHandler
inline static QString expectedMessage; inline static QString expectedMessage;
}; };
/* QNX's compiler requires too many resources, letting the CI system abort the test /*
* mingw is blacklisted due to issues with gcc 4.8 * mingw is blacklisted due to issues with gcc 4.8
* ### TODO: Check if mingw can be safely removed * ### TODO: Check if mingw can be safely removed
*/ */
#if defined(__MINGW32__) || defined(Q_OS_QNX) #if defined(__MINGW32__)
# define TST_QMETATYPE_BROKEN_COMPILER # define TST_QMETATYPE_BROKEN_COMPILER
#endif #endif