diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-28 14:44:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-28 14:44:41 (GMT) |
| commit | b0b255aaa7b7c59557c9415500b6a68b6e96b495 (patch) | |
| tree | d3283b9738479f8ad8ff01c754bbdccc290db071 | |
| parent | c0574fd06731045d6c0a3a0f092216f7d2836ef1 (diff) | |
| parent | 67040500ea2dbc36be89880ad732da1707d26dbb (diff) | |
| download | CMake-b0b255aaa7b7c59557c9415500b6a68b6e96b495.zip CMake-b0b255aaa7b7c59557c9415500b6a68b6e96b495.tar.gz CMake-b0b255aaa7b7c59557c9415500b6a68b6e96b495.tar.bz2 | |
Merge topic 'test-RunCMake-BuildDepends-Borland'
67040500 Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 8782ba9..a578408 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -1,5 +1,11 @@ include(RunCMake) +if(RunCMake_GENERATOR STREQUAL "Borland Makefiles") + set(fs_delay 3) +else() + set(fs_delay 1.125) +endif() + function(run_BuildDepends CASE) # Use a single build tree for a few tests without cleaning. set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${CASE}-build) @@ -17,7 +23,7 @@ function(run_BuildDepends CASE) if(run_BuildDepends_skip_step_2) return() 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) set(check_step 2) run_cmake_command(${CASE}-build2 ${CMAKE_COMMAND} --build . --config Debug) |