From 9440c1a1fccc8962939a837cb2b81cb3584872f3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 14 Dec 2021 13:07:09 +0000 Subject: [PATCH] Revert "tst_qmetatype: Temporarily disable expensive tests on QNX" 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 Pick-to: 6.3 Change-Id: Ib085fbfa7e0d8445f007d1a9346cee3113620720 Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot --- tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h index 6e02959add..767194b928 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.h @@ -48,11 +48,11 @@ struct MessageHandlerCustom : public MessageHandler 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 * ### TODO: Check if mingw can be safely removed */ -#if defined(__MINGW32__) || defined(Q_OS_QNX) +#if defined(__MINGW32__) # define TST_QMETATYPE_BROKEN_COMPILER #endif