mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge topic 'test-bootstrap-args'

Browse Source 
1853cd2bc1 Tests: Add option to control bootstrap arguments in BootstrapTest
da073c667f ci: Update name of option to skip BootstrapTest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12234
This commit is contained in:
Brad King
2026-07-01 09:27:39 -04:00
committed by Kitware Robot
parent 0ac889fdcd 1853cd2bc1
commit a5f4e2a461
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_fedora44_bullseye_coverage.cmake
+1 -1
View File
@@ -6,7 +6,7 @@ set(CMAKE_CXX_COMPILER "/opt/bullseye/bin/c++" CACHE PATH "")
set(configure_no_sccache 1)
# Do not bootstrap for the coverage test suite.
set(CMAKE_SKIP_BOOTSTRAP_TEST TRUE CACHE BOOL "")
set(CMake_TEST_BOOTSTRAP FALSE CACHE BOOL "")
# Shrink stress tests when running with Bullseye.
set(ENV{KWSYS_TEST_PROCESS_1_COUNT} 11)
.gitlab/ci/configure_fedora44_gcc_gcov.cmake
+1 -1
View File
@@ -26,6 +26,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_INIT "${link_flags}" CACHE STRING "")
set(CMAKE_MODULE_LINKER_FLAGS_INIT "${link_flags}" CACHE STRING "")
# Do not bootstrap for the coverage test suite.
set(CMAKE_SKIP_BOOTSTRAP_TEST TRUE CACHE BOOL "")
set(CMake_TEST_BOOTSTRAP FALSE CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora44_common.cmake")
.gitlab/ci/configure_fedora44_valgrind.cmake
+1 -1
View File
@@ -1,2 +1,2 @@
# Disable bootstrap testing for Valgrind testing.
set(CMAKE_SKIP_BOOTSTRAP_TEST OFF CACHE BOOL "")
set(CMake_TEST_BOOTSTRAP FALSE CACHE BOOL "")
Tests/BootstrapTest.cmake
+6 -2
View File
@@ -7,9 +7,13 @@ endif()
if(NOT nproc EQUAL 0)
set(parallel_arg --parallel=${nproc})
endif()
message(STATUS "running bootstrap: ${bootstrap} ${ninja_arg} ${parallel_arg}")
if(args)
string(JOIN "\" \"" args_string ${args})
set(args_string " \"${args_string}\"")
endif()
message(STATUS "running bootstrap: ${bootstrap} ${ninja_arg} ${parallel_arg}${args_string}")
execute_process(
COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg}
COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} ${args}
WORKING_DIRECTORY "${bin_dir}"
RESULT_VARIABLE result
)
Tests/CMakeLists.txt
+1
View File
@@ -3198,6 +3198,7 @@ if(BUILD_TESTING)
-D "bootstrap=${bootstrap}"
-D "bin_dir=${CMake_BINARY_DIR}/Tests/BootstrapTest"
-D "generator=${CMAKE_GENERATOR}"
-D "args=${CMake_TEST_BOOTSTRAP_ARGS}"
-P ${CMAKE_CURRENT_SOURCE_DIR}/BootstrapTest.cmake
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest")