Jelajahi Sumber

Merge topic 'test-race-aix'

b3245f33ef Tests/RunCMake/install: Avoid intermittent failures on AIX

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !9507
Brad King 1 tahun lalu
induk
melakukan
ac44f6335e
1 mengubah file dengan 2 tambahan dan 0 penghapusan
  1. 2 0
      Tests/RunCMake/install/RunCMakeTest.cmake

+ 2 - 0
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)