From 6d6c8303f980b6a297797273453f46431791d766 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 15 Jul 2025 10:36:07 -0400 Subject: [PATCH] Tests: Teach RunCMake.Instrumentation to tolerate make tool output --- Tests/RunCMake/Instrumentation/RunCMakeTest.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake index 7d53b41ca0..cb94fb172f 100644 --- a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake +++ b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake @@ -66,7 +66,9 @@ function(instrument test) run_cmake_command(${test}-build ${CMAKE_COMMAND} --build . --config Debug) endif() if (ARGS_BUILD_MAKE_PROGRAM) + set(RunCMake_TEST_OUTPUT_MERGE 1) run_cmake_command(${test}-make-program ${RunCMake_MAKE_PROGRAM}) + unset(RunCMake_TEST_OUTPUT_MERGE) endif() if (ARGS_INSTALL) run_cmake_command(${test}-install ${CMAKE_COMMAND} --install . --prefix install --config Debug)