Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the other Ctest arguments into a single variable

pull/226/head
Guðni Már Gilbert 2022-10-21 22:02:19 +00:00
parent 745be900ef
commit d6029f7fd2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/CMakeLists.txt
View File

@ -15,13 +15,15 @@ if(GCOV_ENABLE)
COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_BINARY_DIR}/.ctest-finished COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_BINARY_DIR}/.ctest-finished
) )
set(ctest_test_args --timeout 30 --output-on-failure)
include(ProcessorCount) include(ProcessorCount)
ProcessorCount(N) ProcessorCount(N)
if(N EQUAL 0) if(N EQUAL 0)
message(WARNING "CTest: There was an issue reading the core count, tests won't be run in parallel") message(WARNING "CTest: There was an issue reading the core count, tests won't be run in parallel")
else() else()
message(STATUS "CTest: Detected ${N} CPU threads") message(STATUS "CTest: Detected ${N} CPU threads")
set(ctest_test_args ${ctest_test_args} -j${N}) set(ctest_test_args -j${N} ${ctest_test_args})
endif() endif()
# This step needs to always return OK but log whether it was successful or not. The thought here # This step needs to always return OK but log whether it was successful or not. The thought here
@ -29,7 +31,7 @@ if(GCOV_ENABLE)
# after generating the report to determine if the overall build result is a pass or fail. # after generating the report to determine if the overall build result is a pass or fail.
add_custom_target( add_custom_target(
test_run_all test_run_all
COMMAND ${CMAKE_COMMAND} -E env CTEST_OUTPUT_ON_FAILURE=1 ${CMAKE_CTEST_COMMAND} ${ctest_test_args} --timeout 30 COMMAND ${CMAKE_CTEST_COMMAND} ${ctest_test_args}
COMMAND ${CMAKE_COMMAND} -E touch .ctest-finished || exit 0 COMMAND ${CMAKE_COMMAND} -E touch .ctest-finished || exit 0
BYPRODUCTS ${PROJECT_BINARY_DIR}/.ctest-finished BYPRODUCTS ${PROJECT_BINARY_DIR}/.ctest-finished
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"