From 562858c9df4ef907da944712b80c3fa2fc3ca79d Mon Sep 17 00:00:00 2001 From: MrMirDan Date: Thu, 23 Apr 2026 11:08:28 +0300 Subject: [PATCH] update: changed tests dir --- .github/workflows/deploy.yml | 5 ++-- client/tests/CMakeLists.txt | 57 ------------------------------------ 2 files changed, 2 insertions(+), 60 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1849743e3..3b3a7734d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -836,7 +836,6 @@ jobs: - name: 'Run tests' shell: cmd run: | - dir build\client\tests\*.dll set PATH=%PATH%;%Qt6_DIR%\..\..\bin - dir build\client\tests /s | findstr CTestTestfile.cmake - ctest --test-dir build\client\tests --output-on-failure + dir build\client /s | findstr CTestTestfile.cmake + ctest --test-dir build\client --output-on-failure diff --git a/client/tests/CMakeLists.txt b/client/tests/CMakeLists.txt index 342dfad5e..9c3ac6f86 100644 --- a/client/tests/CMakeLists.txt +++ b/client/tests/CMakeLists.txt @@ -206,63 +206,6 @@ target_link_libraries(test_ui_api_services_model_and_controller PRIVATE test_common ) -if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE) - set_target_properties(test_import_export PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_multiple_imports PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_server_edit PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_default_server_change PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_server_edge_cases PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_signal_order PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_servers_model_sync PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_gateway_stacks PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_complex_operations PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_settings_signals PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_ui_servers_model_and_controller PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_self_hosted_server_setup PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_exports PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_serialization PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_ui_language_model_and_controller PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_ui_sites_model_and_controller PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_ui_app_st_model_and_controller PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) - set_target_properties(test_ui_allowed_dns_model_and_controller PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/client/tests" - ) -endif() - enable_testing() add_test(NAME ImportExportTest COMMAND test_import_export) add_test(NAME MultipleImportsTest COMMAND test_multiple_imports)