[cmake-commits] martink committed CMakeLists.txt 1.324 1.325

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6862/Source

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: allow the dashboard to override the timeouts for CTestTest


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- CMakeLists.txt	31 Jan 2007 18:54:02 -0000	1.324
+++ CMakeLists.txt	2 Feb 2007 15:14:50 -0000	1.325
@@ -1079,14 +1079,26 @@
       -S "${CMake_BINARY_DIR}/Tests/CTestTest3/test.cmake" -V
       --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log"
       )
-    # these tests take a log time, make sure they have it
+    # these tests take a long time, make sure they have it
     IF(COMMAND SET_TESTS_PROPERTIES)
-      SET_TESTS_PROPERTIES ( CTestTest CTestTest2 CTestTest3 
-        PROPERTIES TIMEOUT 1500
-        )
+      # if timeouts have not already been set
+      GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
+      IF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND)
+        SET_TESTS_PROPERTIES ( CTestTest PROPERTIES TIMEOUT 1500)
+      ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND)
+
+      GET_TEST_PROPERTY(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
+      IF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND)
+        SET_TESTS_PROPERTIES ( CTestTest2 PROPERTIES TIMEOUT 1500)
+      ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND)
+
+      GET_TEST_PROPERTY(CTestTest3 TIMEOUT PREVIOUS_TIMEOUT)
+      IF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND)
+        SET_TESTS_PROPERTIES ( CTestTest3 PROPERTIES TIMEOUT 1500)
+      ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOT_FOUND)
     ENDIF(COMMAND SET_TESTS_PROPERTIES)
   ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
-
+  
   IF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode)
     SET(CMAKE_SKIP_BOOTSTRAP_TEST 1)
   ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode)