[Cmake-commits] [cmake-commits] zach.mullen committed cmCTest.cxx 1.391 1.392

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx 
Log Message:
Moved call to cache CDash version information to cmCTest::initialize.  Also added a 3 second timeout when requesting the version from the server.  Added an option to the CTestConfiguration that will be used to determine whether to query the version information at all.  (Behavior for this setting is not yet defined.)  Updated CMake's local CDash version setting to 1.6.


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.391
retrieving revision 1.392
diff -C 2 -d -r1.391 -r1.392
*** cmCTest.cxx	5 Feb 2010 00:00:20 -0000	1.391
--- cmCTest.cxx	8 Feb 2010 14:47:39 -0000	1.392
***************
*** 350,356 ****
      it->second->SetCTestInstance(this);
      }
!   // call this so that the information is cached up front
!   // and not the first time EndTest is called.
!   this->ShouldCompressTestOutput();
    // Make sure we can capture the build tool output.
    cmSystemTools::EnableVSConsoleOutput();
--- 350,354 ----
      it->second->SetCTestInstance(this);
      }
! 
    // Make sure we can capture the build tool output.
    cmSystemTools::EnableVSConsoleOutput();
***************
*** 401,405 ****
    url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
    
!   int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response);
    
    return res ? this->GetCTestConfiguration("CDashVersion") : response;
--- 399,403 ----
    url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
    
!   int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
    
    return res ? this->GetCTestConfiguration("CDashVersion") : response;
***************
*** 474,477 ****
--- 472,479 ----
      }
  
+   // call this so that the information is cached up front
+   // and not the first time EndTest is called.
+   this->ShouldCompressTestOutput();
+ 
    if ( this->ProduceXML )
      {