[Cmake-commits] CMake branch, master, updated. d80323bccd12cc64f3443c49e7cbda2a0506ace1

cmake-commits at cmake.org cmake-commits at cmake.org
Fri May 7 11:20:23 EDT 2010


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, master has been updated
       via  d80323bccd12cc64f3443c49e7cbda2a0506ace1 (commit)
      from  231cbbef80210da31385427b45361f76d81ee294 (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=d80323bccd12cc64f3443c49e7cbda2a0506ace1
commit d80323bccd12cc64f3443c49e7cbda2a0506ace1
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Fri May 7 11:16:44 2010 -0400

    Fix CTestTestScheduler sporadic failure.
    
    Increased the time difference between each test so that overburdened systems won't fail this test sometimes.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 6159265..330cf9f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1305,7 +1305,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/testOutput.log"
     )
   SET_TESTS_PROPERTIES(CTestTestScheduler PROPERTIES
-    PASS_REGULAR_EXPRESSION "Start 1.*Start 2.*Start 3.*Start 4.*Start 5.*Start 5.*Start 4.*Start 3.*Start 2.*Start 1")
+    PASS_REGULAR_EXPRESSION "Start 1.*Start 2.*Start 3.*Start 4.*Start 4.*Start 3.*Start 2.*Start 1")
 
   CONFIGURE_FILE(
     "${CMake_SOURCE_DIR}/Tests/CTestTestStopTime/test.cmake.in"
diff --git a/Tests/CTestTestScheduler/CMakeLists.txt b/Tests/CTestTestScheduler/CMakeLists.txt
index 8e7678d..882988f 100644
--- a/Tests/CTestTestScheduler/CMakeLists.txt
+++ b/Tests/CTestTestScheduler/CMakeLists.txt
@@ -4,6 +4,6 @@ INCLUDE (CTest)
 
 ADD_EXECUTABLE (Sleep sleep.c)
 
-FOREACH (time RANGE 1 5)
+FOREACH (time RANGE 1 4)
   ADD_TEST (TestSleep${time} Sleep ${time})
-ENDFOREACH (time RANGE 1 5)
+ENDFOREACH (time RANGE 1 4)
diff --git a/Tests/CTestTestScheduler/sleep.c b/Tests/CTestTestScheduler/sleep.c
index b06776c..9631a68 100644
--- a/Tests/CTestTestScheduler/sleep.c
+++ b/Tests/CTestTestScheduler/sleep.c
@@ -4,13 +4,13 @@
 # include <unistd.h>
 #endif
 
-/* sleeps for 2n seconds, where n is the argument to the program */
+/* sleeps for 4n seconds, where n is the argument to the program */
 int main(int argc, char** argv)
 {
   int time;
   if(argc > 1)
     {
-    time = 3 * atoi(argv[1]);
+    time = 4 * atoi(argv[1]);
     }
 #if defined(_WIN32)
   Sleep(time * 1000);

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

Summary of changes:
 Tests/CMakeLists.txt                    |    2 +-
 Tests/CTestTestScheduler/CMakeLists.txt |    4 ++--
 Tests/CTestTestScheduler/sleep.c        |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list