kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles

Browse Source 
Our 1.125s delay does not seem to be long enough to be reliable with
the Borland "make" tool.  Use a longer delay for Borland.
This commit is contained in:
Brad King 2015-09-25 09:10:37 -04:00
parent 7c0b22a84e
commit 67040500ea
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
View File

@ -1,5 +1,11 @@
include(RunCMake) include(RunCMake)
if(RunCMake_GENERATOR STREQUAL "Borland Makefiles")
set(fs_delay 3)
else()
set(fs_delay 1.125)
endif()
function(run_BuildDepends CASE) function(run_BuildDepends CASE)
# Use a single build tree for a few tests without cleaning. # Use a single build tree for a few tests without cleaning.
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${CASE}-build) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${CASE}-build)
@ -17,7 +23,7 @@ function(run_BuildDepends CASE)
if(run_BuildDepends_skip_step_2) if(run_BuildDepends_skip_step_2)
return() return()
endif() endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay}) # handle 1s resolution
include(${RunCMake_SOURCE_DIR}/${CASE}.step2.cmake OPTIONAL) include(${RunCMake_SOURCE_DIR}/${CASE}.step2.cmake OPTIONAL)
set(check_step 2) set(check_step 2)
run_cmake_command(${CASE}-build2 ${CMAKE_COMMAND} --build . --config Debug) run_cmake_command(${CASE}-build2 ${CMAKE_COMMAND} --build . --config Debug)