From c91b5dae9a5e62e3912781a8e7520a746bc8983e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 14 Oct 2021 11:25:43 +0300 Subject: [PATCH] QNX: Generate empty string for WORKING_DIRECTORY test wrapper Tests for QNX are run in qemu over ssh and setting WORKING_DIRECTORY will cause created test wrapper to try change specified directory which will fail (expects local directory) when test is invoked over ssh. Task-number: QTBUG-87628 Pick-to: 6.2 Change-Id: If991002398811cc9cb9cbac54da5d2cb0d8c3589 Reviewed-by: Alexandru Croitor --- cmake/QtTestHelpers.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 3add288b3df..a9abb604937 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -285,6 +285,9 @@ function(qt_internal_add_test name) if (ANDROID) qt_internal_android_test_arguments("${name}" test_executable extra_test_args) set(test_working_dir "${CMAKE_CURRENT_BINARY_DIR}") + elseif(QNX) + set(test_working_dir "") + set(test_executable "${name}") else() if(arg_QMLTEST AND NOT arg_SOURCES) set(test_working_dir "${CMAKE_CURRENT_SOURCE_DIR}") @@ -508,7 +511,7 @@ function(qt_internal_create_command_script) is not specified") endif() - if(NOT arg_WORKING_DIRECTORY) + if(NOT arg_WORKING_DIRECTORY AND NOT QNX) set(arg_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") endif()