From 4e3a1675793995e44f5c84f28bfdc0fd02aa27cc Mon Sep 17 00:00:00 2001 From: Matthias Rauter Date: Tue, 8 Apr 2025 18:35:39 +0200 Subject: [PATCH] Exclude one more MSVC version in tst_qcheckedint and tst_qnumeric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I am using version 1943 and some section in the test that have been marked as not working up until version 1942 are not working with 1943 either. I adjusted the respective sections to also exclude 1943. Change-Id: I9f0ed1c1dba919d98772d45216f16857983978cd Reviewed-by: Giuseppe D'Angelo Reviewed-by: Mårten Nordheim --- tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp | 2 +- tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp b/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp index d04b206793c..65153936b63 100644 --- a/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp +++ b/tests/auto/corelib/global/qcheckedint/tst_qcheckedint.cpp @@ -347,7 +347,7 @@ void tst_QCheckedInt::division() // This causes an internal compiler error on MSVC, so skipping it there // Integrity's compiler says this code isn't constexpr. -#if (!defined(Q_CC_MSVC) || Q_CC_MSVC > 1942) && !defined(Q_CC_GHS) +#if (!defined(Q_CC_MSVC) || Q_CC_MSVC > 1943) && !defined(Q_CC_GHS) template constexpr bool checkedIntTypeProperties() diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp index 0a49118e637..9899850debe 100644 --- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp @@ -1017,7 +1017,7 @@ SUB_OVERFLOW_UNSIGNED_TYPE_TEST(ulong, ULONG_MAX) #if defined(QT_HAS_128_BIT_MULTIPLICATION) // Compiling this causes an ICE in MSVC, so skipping it -#if !defined(Q_CC_MSVC) || Q_CC_MSVC > 1942 +#if !defined(Q_CC_MSVC) || Q_CC_MSVC > 1943 SIGNED_TYPE_TEST(qlonglong, LLONG_MIN, LLONG_MAX) UNSIGNED_TYPE_TEST(qulonglong, ULLONG_MAX) #endif