From c5759c962de6f5e11d2626b36d7c8cd32b148269 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Fri, 12 Apr 2024 14:02:09 +0200 Subject: [PATCH] Skip tst_qcomparehelpers_cpp23 on Linux arm Because it causes issues in the CI As a drive-by, also backport the NOT VXWORKS check. Change-Id: I8cd232abf1c4ee1d9417a8bff9aa3bcf5f893e8f Reviewed-by: Tatiana Borisova Reviewed-by: Volker Hilsheimer (cherry picked from commit 4f6600ee6554f04ac5dac0e547488432c13630a6) --- tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt b/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt index 34aa75abc22..4cbfd97c695 100644 --- a/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt +++ b/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qcomparehelpers # CMake recognizes CXX_STANDARD=23 only starting from version 3.20 # macOS has some issues with concepts, see QTBUG-117765 -if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20" AND NOT MACOS) +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20" AND NOT MACOS AND NOT VXWORKS AND NOT (LINUX AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) qt_internal_add_test(tst_qcomparehelpers_cpp23 SOURCES tst_qcomparehelpers.h tst_qcomparehelpers.cpp