[cmake-commits] hoffman committed cmCTest.cxx 1.327 1.328

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx 
Log Message:
ENH: allow test properties to set a timeout that is longer than the default timeout, but not longer than CTEST_TIME_LIMIT for a script


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- cmCTest.cxx	11 Sep 2007 15:21:36 -0000	1.327
+++ cmCTest.cxx	18 Sep 2007 15:34:53 -0000	1.328
@@ -1095,10 +1095,12 @@
     {
     timeout = this->TimeOut;
     }
-  if (testTimeOut && testTimeOut < timeout)
+  if (testTimeOut 
+      && testTimeOut < this->GetRemainingTimeAllowed())
     {
     timeout = testTimeOut;
     }
+
   // always have at least 1 second if we got to here
   if (timeout <= 0)
     {