diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-21 16:18:18 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-10-21 16:22:44 (GMT) |
| commit | e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f (patch) | |
| tree | b98a6760e5d2327eeb05616e7816d48334baf104 /Tests | |
| parent | 1e555a44aa4e3d40bca2f88915c9f957098e5a55 (diff) | |
| download | CMake-e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f.zip CMake-e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f.tar.gz CMake-e3770c56a8ef6b20f473556a1ca29ea6e0f51f7f.tar.bz2 | |
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.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BootstrapTest.cmake | 9 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
2 files changed, 9 insertions, 4 deletions
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) |