[Cmake-commits] [cmake-commits] david.cole committed cmCTestBuildAndTestHandler.cxx 1.27 1.28 cmCTestRunTest.cxx 1.26 1.27

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestBuildAndTestHandler.cxx cmCTestRunTest.cxx 
Log Message:
Fix floating point comparison warnings. Thanks to Alex Neundorf for the patch.


Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** cmCTestBuildAndTestHandler.cxx	28 Sep 2009 15:42:57 -0000	1.27
--- cmCTestBuildAndTestHandler.cxx	13 Oct 2009 20:39:48 -0000	1.28
***************
*** 252,256 ****
      {
      double remainingTime = 0;
!     if (this->Timeout)
        {
        remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start;
--- 252,256 ----
      {
      double remainingTime = 0;
!     if (this->Timeout > 0)
        {
        remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start;
***************
*** 377,381 ****
    // how much time is remaining
    double remainingTime = 0;
!   if (this->Timeout)
      {
      remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start;
--- 377,381 ----
    // how much time is remaining
    double remainingTime = 0;
!   if (this->Timeout > 0)
      {
      remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start;

Index: cmCTestRunTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** cmCTestRunTest.cxx	5 Oct 2009 14:20:48 -0000	1.26
--- cmCTestRunTest.cxx	13 Oct 2009 20:39:48 -0000	1.27
***************
*** 420,428 ****
    // determine how much time we have
    double timeout = this->CTest->GetRemainingTimeAllowed() - 120;
!   if (this->CTest->GetTimeOut() && this->CTest->GetTimeOut() < timeout)
      {
      timeout = this->CTest->GetTimeOut();
      }
!   if (testTimeOut 
        && testTimeOut < this->CTest->GetRemainingTimeAllowed())
      {
--- 420,428 ----
    // determine how much time we have
    double timeout = this->CTest->GetRemainingTimeAllowed() - 120;
!   if (this->CTest->GetTimeOut() > 0 && this->CTest->GetTimeOut() < timeout)
      {
      timeout = this->CTest->GetTimeOut();
      }
!   if (testTimeOut > 0
        && testTimeOut < this->CTest->GetRemainingTimeAllowed())
      {