From b3245f33efe98e95be8d4a542c61692bb0b34d0f Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 10 May 2024 07:48:21 -0400 Subject: [PATCH] Tests/RunCMake/install: Avoid intermittent failures on AIX Since commit 3a739d4dcb (EXPORT_PACKAGE_DEPENDENCIES: Add experimental feature gate, 2024-03-12, v3.29.0-rc4~6^2) a case has intermittently failed due to CMake rerunning during the case's build step and printing the feature gate warning to stderr. Redirect all build output to stdout as we do in similar cases elsewhere. Although we don't expect CMake to re-run in this case, somehow an AIX host's filesystem is occasionally recording high-resolution timestamps out of order among files saved in quick succession. --- Tests/RunCMake/install/RunCMakeTest.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 0439b42ef4..7b0aa85225 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)