[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestTestHandler.cxx 1.128 1.129

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
CMake global timeout (--timeout option) should prevail over individual test timeouts if it is lower than the individual timeout.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.128
retrieving revision 1.129
diff -C 2 -d -r1.128 -r1.129
*** cmCTestTestHandler.cxx	2 Dec 2009 21:37:43 -0000	1.128
--- cmCTestTestHandler.cxx	7 Dec 2009 18:25:54 -0000	1.129
***************
*** 1052,1056 ****
        }
  
!     if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0)
        {
        p.Timeout = this->CTest->GetGlobalTimeout();
--- 1052,1057 ----
        }
  
!     if((p.Timeout == 0 || p.Timeout > this->CTest->GetGlobalTimeout())
!        && this->CTest->GetGlobalTimeout() != 0)
        {
        p.Timeout = this->CTest->GetGlobalTimeout();