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 d409750325ca6d5abc1f75f2eb25f4e893f0a972 (commit) via e4114ee9e93dc899724c48802cc529efec92f547 (commit) from bf6bb44b940298253bc5873a410482ae2b277c88 (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d409750325ca6d5abc1f75f2eb25f4e893f0a972 commit d409750325ca6d5abc1f75f2eb25f4e893f0a972 Merge: bf6bb44 e4114ee Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon May 19 10:50:44 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon May 19 10:50:44 2014 -0400 Merge topic 'test-BuildDepends-sleep' into next e4114ee9 Tests/BuildDepends: Make 3-second delay more robust http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4114ee9e93dc899724c48802cc529efec92f547 commit e4114ee9e93dc899724c48802cc529efec92f547 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon May 19 10:50:11 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon May 19 10:51:16 2014 -0400 Tests/BuildDepends: Make 3-second delay more robust Use "cmake -E sleep 3" instead of execute_process with a TIMEOUT of 3. This avoids using a busy loop or depending on a timeout to kill it. diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt index a875f07..8df331e 100644 --- a/Tests/BuildDepends/CMakeLists.txt +++ b/Tests/BuildDepends/CMakeLists.txt @@ -182,8 +182,7 @@ else() endif() message("Waiting 3 seconds...") -# any additional argument will cause ${bar} to wait forever -execute_process(COMMAND ${bar} -infinite TIMEOUT 3 OUTPUT_VARIABLE out) +execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 3) message("Modifying Project/foo.cxx") write_file(${BuildDepends_BINARY_DIR}/Project/foo.cxx diff --git a/Tests/BuildDepends/Project/bar.cxx b/Tests/BuildDepends/Project/bar.cxx index 25d8bd2..dadf93d 100644 --- a/Tests/BuildDepends/Project/bar.cxx +++ b/Tests/BuildDepends/Project/bar.cxx @@ -15,11 +15,5 @@ int main(int argc, char** argv) /* Print out the string that should have been regenerated. */ printf("%s\n", regen_string); fflush(stdout); - // if any argument is used, wait forever - if (argc>1) - { - // wait that we get killed... - for(;;); - } return 0; } ----------------------------------------------------------------------- Summary of changes: Tests/BuildDepends/CMakeLists.txt | 3 +-- Tests/BuildDepends/Project/bar.cxx | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits