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

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
Local test timeouts will now always take precedence over the global --timeout option.


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