[Cmake-commits] CMake branch, next, updated. v2.8.12-4483-ge3d76ff

[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  e3d76fff757ed809f8a4833c703cebda7d944ab5 (commit)
       via  1cdee0eee904b59e2fda621476ff223ea90a96c9 (commit)
      from  b4bc82d5c7fc124b1df1cc3cb7b1b27314f7f622 (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=e3d76fff757ed809f8a4833c703cebda7d944ab5
commit e3d76fff757ed809f8a4833c703cebda7d944ab5
Merge: b4bc82d 1cdee0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 25 08:38:02 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 08:38:02 2013 -0400

    Merge topic 'ctest-p4' into next
    
    1cdee0e CTest.UpdateP4: Wait for p4d to start more robustly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cdee0eee904b59e2fda621476ff223ea90a96c9
commit 1cdee0eee904b59e2fda621476ff223ea90a96c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 25 08:35:13 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 25 08:35:13 2013 -0400

    CTest.UpdateP4: Wait for p4d to start more robustly
    
    On a busy system running tests in parallel the p4d server may take
    longer than two seconds to start.  Teach the shell code used to start
    the server to poll once per second for the server using the p4 client to
    test the connection.  Try for 10 seconds before giving up.  Log the
    steps.

diff --git a/Tests/CTestUpdateP4.cmake.in b/Tests/CTestUpdateP4.cmake.in
index 71f9bf5..f23bd11 100644
--- a/Tests/CTestUpdateP4.cmake.in
+++ b/Tests/CTestUpdateP4.cmake.in
@@ -54,21 +54,19 @@ if(UNIX)
   message("Server command line: ${P4_SERVER}")
 
   execute_process(
-    COMMAND sh -c "${P4_SERVER}"
-  )
-
-  message("Waiting two seconds for p4d to initialize")
-  find_program(SLEEP sleep)
-  if(SLEEP)
-    execute_process (
-      COMMAND "${SLEEP}" 2
-      TIMEOUT 2
-      ERROR_QUIET
-      OUTPUT_QUIET
+    COMMAND sh -c "
+${P4_SERVER}
+for i in 1 2 3 4 5 6 7 8 9 10; do
+  echo 'Waiting for server to start...'
+  sleep 1
+  if '${P4}' -H ${P4_HOST} -p ${P4_PORT} help >/dev/null 2>&1; then
+    echo 'Server started.'
+    exit
+  fi
+done
+echo 'Gave up waiting for server to start.'
+"
     )
-  else()
-    message("The sleep command was not found")
-  endif()
 endif()
 
 #-----------------------------------------------------------------------------

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

Summary of changes:
 Tests/CTestUpdateP4.cmake.in |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake