This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 5b23ea48ac45f2b08ec1941c291608737ec16555 (commit) via e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f (commit) from 174057f9e157e570a83cf7cd55a7e121d0f4c63c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b23ea48ac45f2b08ec1941c291608737ec16555 commit 5b23ea48ac45f2b08ec1941c291608737ec16555 Merge: 174057f e3770c5 Author: Daniel Pfeifer <dan...@pfeifer-mail.de> AuthorDate: Fri Oct 21 14:06:54 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Oct 21 14:06:54 2016 -0400 Merge topic 'parallel-boostrap-test' into next e3770c56 BootstrapTest: Use --parallel=... argument. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f commit e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f Author: Daniel Pfeifer <dan...@pfeifer-mail.de> AuthorDate: Fri Oct 21 18:18:18 2016 +0200 Commit: Daniel Pfeifer <dan...@pfeifer-mail.de> CommitDate: Fri Oct 21 18:22:44 2016 +0200 BootstrapTest: Use --parallel=... argument. Determine the number of processors and provide it to the bootstrap script. Also make sure this test does not run parallel with other tests. diff --git a/Tests/BootstrapTest.cmake b/Tests/BootstrapTest.cmake index 9c9fe09..07a65bf 100644 --- a/Tests/BootstrapTest.cmake +++ b/Tests/BootstrapTest.cmake @@ -1,7 +1,12 @@ file(MAKE_DIRECTORY "${bin_dir}") -message(STATUS "running bootstrap: ${bootstrap}") +include(ProcessorCount) +ProcessorCount(nproc) +if(NOT nproc EQUAL 0) + set(parallel_arg --parallel=${nproc}) +endif() +message(STATUS "running bootstrap: ${bootstrap} ${parallel_arg}") execute_process( - COMMAND ${bootstrap} + COMMAND ${bootstrap} ${parallel_arg} WORKING_DIRECTORY "${bin_dir}" RESULT_VARIABLE result ) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7df9403..5d72e5c 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3081,8 +3081,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release -P ${CMAKE_CURRENT_SOURCE_DIR}/BootstrapTest.cmake ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest") - # Make this test run early during parallel execution - set_tests_properties(BootstrapTest PROPERTIES COST 5000) + # This test will use all processors. + set_tests_properties(BootstrapTest PROPERTIES RUN_SERIAL 1) # provide more time for the bootstrap test get_test_property(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT) ----------------------------------------------------------------------- Summary of changes: Tests/BootstrapTest.cmake | 9 +++++++-- Tests/CMakeLists.txt | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits