Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 04:24:36 +08:00
Code Issues Projects Releases Wiki Activity

Tests: Teach RunCMake.Instrumentation to tolerate make tool output

Browse Source
This commit is contained in:
Brad King
2025-07-15 10:36:07 -04:00
committed by Tyler Yankee
parent 8eeeeb7efe
commit 6d6c8303f9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/Instrumentation/RunCMakeTest.cmake
View File

@@ -66,7 +66,9 @@ function(instrument test)
run_cmake_command(${test}-build ${CMAKE_COMMAND} --build . --config Debug) run_cmake_command(${test}-build ${CMAKE_COMMAND} --build . --config Debug)
endif() endif()
if (ARGS_BUILD_MAKE_PROGRAM) if (ARGS_BUILD_MAKE_PROGRAM)
set(RunCMake_TEST_OUTPUT_MERGE 1)
run_cmake_command(${test}-make-program ${RunCMake_MAKE_PROGRAM}) run_cmake_command(${test}-make-program ${RunCMake_MAKE_PROGRAM})
unset(RunCMake_TEST_OUTPUT_MERGE)
endif() endif()
if (ARGS_INSTALL) if (ARGS_INSTALL)
run_cmake_command(${test}-install ${CMAKE_COMMAND} --install . --prefix install --config Debug) run_cmake_command(${test}-install ${CMAKE_COMMAND} --install . --prefix install --config Debug)