From fe5d000fcd7668fa73227a6170006fb112a425cd Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 5 Oct 2026 13:02:03 +0500 Subject: test upgrading cmake-common to origin/master --- 3rdparty/winapi/utf8 | 2 +- cmake | 2 +- test/unit_tests/CMakeLists.txt | 21 ++++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/3rdparty/winapi/utf8 b/3rdparty/winapi/utf8 index 04ba2f9..db61f89 160000 --- a/3rdparty/winapi/utf8 +++ b/3rdparty/winapi/utf8 @@ -1 +1 @@ -Subproject commit 04ba2f94eebb337b4e397008cbca387f9d76a361 +Subproject commit db61f89787eb8328b436d7ffb29f7c0235dedbe6 diff --git a/cmake b/cmake index 88a20a8..84cf347 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 88a20a8b36ded8137c5bedb6851c3974926e68d0 +Subproject commit 84cf347f666652998f107d68649ba939ba1ec319 diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index bdb13c6..0c9c9b4 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -32,7 +32,8 @@ endif() find_package(Python3 REQUIRED COMPONENTS Interpreter) -add_test(NAME unit_tests COMMAND unit_tests +add_test(NAME unit_tests + COMMAND unit_tests --log_level=all --no_color_output "--log_sink=$/unit_tests.log" @@ -43,16 +44,20 @@ add_test(NAME unit_tests COMMAND unit_tests "--worker_exe=$" ) -add_test(NAME unit_tests_report COMMAND Python3::Interpreter - "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/tools/ctest-driver.py" +add_test(NAME unit_tests_report + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake" + COMMAND Python3::Interpreter + -m project.ctest_driver grep --pass-regex [=[^\*\*\* No errors detected$]=] -- "$/unit_tests_report.txt" ) -add_test(NAME console_tests COMMAND Python3::Interpreter - "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/tools/ctest-driver.py" +add_test(NAME console_tests + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake" + COMMAND Python3::Interpreter + -m project.ctest_driver run --new-window -- @@ -67,8 +72,10 @@ add_test(NAME console_tests COMMAND Python3::Interpreter "--worker_exe=$" ) -add_test(NAME console_tests_report COMMAND Python3::Interpreter - "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/tools/ctest-driver.py" +add_test(NAME console_tests_report + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake" + COMMAND Python3::Interpreter + -m project.ctest_driver grep --pass-regex [=[^\*\*\* No errors detected$]=] -- -- cgit v1.3