summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-05-21 13:20:22 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-05-21 13:20:29 (GMT)
commit85e9025f80c7b3cc71984e9b20b0d443b71e71ef (patch)
tree851b0f3eee8e61b377fc38deb284d22ed7d5d9db /Tests/RunCMake
parent6c08be8ea5a7a7adc72431bd442605a08ac413fb (diff)
parent9ced5932cf1ca74100f5d9419346054001f82e59 (diff)
downloadCMake-85e9025f80c7b3cc71984e9b20b0d443b71e71ef.zip
CMake-85e9025f80c7b3cc71984e9b20b0d443b71e71ef.tar.gz
CMake-85e9025f80c7b3cc71984e9b20b0d443b71e71ef.tar.bz2
Merge topic 'test-race-aix'
9ced5932cf Tests/RunCMake/CompileFeatures: Avoid intermittent failures on AIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9537
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 731a303..487284b 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -53,6 +53,7 @@ function(test_build)
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${test}-build")
run_cmake(${test})
set(RunCMake_TEST_NO_CLEAN 1)
+ set(RunCMake_TEST_OUTPUT_MERGE 1)
run_cmake_command(${test}-build ${CMAKE_COMMAND} --build . ${ARGN})
endfunction()