From 6216e5aa32ebf7e5d2dbd3581763dc854ce360d9 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 19 Dec 2023 13:52:42 +0200 Subject: [PATCH] CMake: don't set TIMEOUT_SIGNAL_NAME for Android target on Windows host TIMEOUT_SIGNAL_NAME and TIMEOUT_SIGNAL_GRACE_PERIOD are not supported on Windows. Amends 4a3936c33cb2ab9fee2e93cbe99d31daf1cd0cc8. Task-number: QTBUG-106479 Change-Id: Ifa00a9183750454960b1ff24e1a0048224feff4b Reviewed-by: Alexey Edelev (cherry picked from commit 1a7db3ab11ef9500e9c6bf111d7525cacca2f867) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 8f9543e0aaee15c5d51377f708451f3f2aa73956) (cherry picked from commit 69308e7438aeb219e8ee6f7e6ff3f602c99d28ab) --- cmake/QtTestHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index c788d8e3fba..6da1a4cbea4 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -635,7 +635,7 @@ function(qt_internal_add_test name) set_tests_properties(${testname} PROPERTIES TIMEOUT ${arg_TIMEOUT}) endif() - if(ANDROID) + if(ANDROID AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") # Set timeout signal and some time for androidtestrunner to do cleanup set_tests_properties(${testname} PROPERTIES TIMEOUT_SIGNAL_NAME "SIGINT"