diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-13 13:34:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-05-13 13:34:46 (GMT) |
| commit | ac44f6335e23d43732d6daaf6620c2de0df4d884 (patch) | |
| tree | f729d953dd7b81ce73b376e59203e5282a9d15e7 /Tests/RunCMake | |
| parent | 05d03c67fb18f1f49300ebffdb797bc7d7984dc0 (diff) | |
| parent | b3245f33efe98e95be8d4a542c61692bb0b34d0f (diff) | |
| download | CMake-ac44f6335e23d43732d6daaf6620c2de0df4d884.zip CMake-ac44f6335e23d43732d6daaf6620c2de0df4d884.tar.gz CMake-ac44f6335e23d43732d6daaf6620c2de0df4d884.tar.bz2 | |
Merge topic 'test-race-aix'
b3245f33ef Tests/RunCMake/install: Avoid intermittent failures on AIX
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9507
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/install/RunCMakeTest.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 0439b42..7b0aa85 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -8,7 +8,9 @@ function(run_install_test case) file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake(${case}) + set(RunCMake_TEST_OUTPUT_MERGE 1) run_cmake_command(${case}-build ${CMAKE_COMMAND} --build . --config Debug) + unset(RunCMake_TEST_OUTPUT_MERGE) # Check "all" components. set(CMAKE_INSTALL_PREFIX ${RunCMake_TEST_BINARY_DIR}/root-all) run_cmake_command(${case}-all ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBUILD_TYPE=Debug -P cmake_install.cmake) |