[Cmake-commits] CMake branch, next, updated. v3.3.2-3256-gd255a9c

[Brad King]

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  d255a9c0e5d915230608ecc333787c133cbdb264 (commit)
       via  67040500ea2dbc36be89880ad732da1707d26dbb (commit)
      from  9163059ccf5f3f4cd652012a6ce25be800d7b470 (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=d255a9c0e5d915230608ecc333787c133cbdb264
commit d255a9c0e5d915230608ecc333787c133cbdb264
Merge: 9163059 6704050
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 09:12:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 25 09:12:08 2015 -0400

    Merge topic 'test-RunCMake-BuildDepends-Borland' into next
    
    67040500 Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67040500ea2dbc36be89880ad732da1707d26dbb
commit 67040500ea2dbc36be89880ad732da1707d26dbb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 09:10:37 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 25 09:10:37 2015 -0400

    Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles
    
    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.

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)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake