[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestTestHandler.cxx 1.126 1.127

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
Added the --timeout option to ctest command line.  This sets a global timeout on all tests if no more specific timeout is set on them.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.126
retrieving revision 1.127
diff -C 2 -d -r1.126 -r1.127
*** cmCTestTestHandler.cxx	10 Nov 2009 15:40:11 -0000	1.126
--- cmCTestTestHandler.cxx	30 Nov 2009 21:08:10 -0000	1.127
***************
*** 1053,1056 ****
--- 1053,1061 ----
        }
  
+     if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0)
+       {
+       p.Timeout = this->CTest->GetGlobalTimeout();
+       }
+ 
      if(p.Depends.size())
        {