diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-10-14 11:25:43 +0300 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-10-27 13:30:01 +0300 |
| commit | c91b5dae9a5e62e3912781a8e7520a746bc8983e (patch) | |
| tree | 76bd5300118b088a9e69a2f06f7990a0543887ec | |
| parent | 6de36918c03e91933fbfb5bf7b53abbe03edf460 (diff) | |
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 <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 3add288b3d..a9abb60493 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() |