[Cmake-commits] [cmake-commits] david.cole committed cmCTest.cxx 1.374 1.375

[cmake-commits at cmake.org]

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

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


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.374
retrieving revision 1.375
diff -C 2 -d -r1.374 -r1.375
*** cmCTest.cxx	13 Oct 2009 12:56:38 -0000	1.374
--- cmCTest.cxx	13 Oct 2009 20:39:47 -0000	1.375
***************
*** 1083,1091 ****
    // determine how much time we have
    double timeout = this->GetRemainingTimeAllowed() - 120;
!   if (this->TimeOut && this->TimeOut < timeout)
      {
      timeout = this->TimeOut;
      }
!   if (testTimeOut 
        && testTimeOut < this->GetRemainingTimeAllowed())
      {
--- 1083,1091 ----
    // determine how much time we have
    double timeout = this->GetRemainingTimeAllowed() - 120;
!   if (this->TimeOut > 0 && this->TimeOut < timeout)
      {
      timeout = this->TimeOut;
      }
!   if (testTimeOut > 0
        && testTimeOut < this->GetRemainingTimeAllowed())
      {
***************
*** 1119,1123 ****
          // invocations. Since --build-generator is required this is a 
          // good place to check for it, and to add the arguments in
!         if (strcmp(argv[i],"--build-generator") == 0 && timeout)
            {
            args.push_back("--test-timeout");
--- 1119,1123 ----
          // invocations. Since --build-generator is required this is a 
          // good place to check for it, and to add the arguments in
!         if (strcmp(argv[i],"--build-generator") == 0 && timeout > 0)
            {
            args.push_back("--test-timeout");