Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 13:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-add dynamic CTEST_PARALLEL_LEVEL detection

Browse source 
When it is not hard-coded in the environment variable of the same name.
This commit is contained in:
Mahmoud Al-Qudsi 2025-01-08 18:07:16 -06:00 committed by Fabian Boehm
parent 3bbfaf532e
commit 417b2eb8c6
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/Tests.cmake
View file

@ -1,6 +1,14 @@
# This adds ctest support to the project # This adds ctest support to the project
enable_testing() enable_testing()
# By default, ctest runs tests serially
if(NOT CTEST_PARALLEL_LEVEL)
include(ProcessorCount)
ProcessorCount(CORES)
set(CTEST_PARALLEL_LEVEL ${CORES})
endif()
# Put in a tests folder to reduce the top level targets in IDEs. # Put in a tests folder to reduce the top level targets in IDEs.
set(CMAKE_FOLDER tests) set(CMAKE_FOLDER tests)
@ -15,6 +23,8 @@ set(SKIP_RETURN_CODE 125)
# shells out to `ctest`, so there are no build-related benefits to not doing that ourselves. # shells out to `ctest`, so there are no build-related benefits to not doing that ourselves.
# * CMake devs insist that it is appropriate for `make test` to never depend on `make all`, i.e. # * CMake devs insist that it is appropriate for `make test` to never depend on `make all`, i.e.
# running `make test` does not require any of the binaries to be built before testing. # running `make test` does not require any of the binaries to be built before testing.
# * It is not possible to set top-level CTest options/settings such as CTEST_PARALLEL_LEVEL from
# within the CMake configuration file.
# * The only way to have a test depend on a binary is to add a fake test with a name like # * The only way to have a test depend on a binary is to add a fake test with a name like
# "build_fish" that executes CMake recursively to build the `fish` target. # "build_fish" that executes CMake recursively to build the `fish` target.
# * Circling back to the point about individual tests not being actual Makefile targets, CMake does # * Circling back to the point about individual tests not being actual Makefile targets, CMake does
@ -24,7 +34,7 @@ set(SKIP_RETURN_CODE 125)
# The top-level test target is "fish_run_tests". # The top-level test target is "fish_run_tests".
add_custom_target(fish_run_tests add_custom_target(fish_run_tests
COMMAND env FISH_FORCE_COLOR=1 COMMAND env CTEST_PARALLEL_LEVEL=${CTEST_PARALLEL_LEVEL} FISH_FORCE_COLOR=1
FISH_SOURCE_DIR=${CMAKE_SOURCE_DIR} FISH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose ${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose
--output-on-failure --progress --output-on-failure --progress