[Cmake-commits] [cmake-commits] zach.mullen committed cmCTest.cxx 1.383 1.384 cmCTest.h 1.129 1.130

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmCTest.h 
Log Message:
Query the CDash web API to automate CDash version detection.


Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -C 2 -d -r1.129 -r1.130
*** cmCTest.h	21 Dec 2009 17:27:04 -0000	1.129
--- cmCTest.h	21 Dec 2009 20:47:29 -0000	1.130
***************
*** 198,201 ****
--- 198,203 ----
    bool ShouldCompressTestOutput();
  
+   std::string GetCDashVersion();
+ 
    //Used for parallel ctest job scheduling
    std::string GetScheduleType() { return this->ScheduleType; }

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.383
retrieving revision 1.384
diff -C 2 -d -r1.383 -r1.384
*** cmCTest.cxx	21 Dec 2009 17:27:04 -0000	1.383
--- cmCTest.cxx	21 Dec 2009 20:47:29 -0000	1.384
***************
*** 305,311 ****
  {
    if(!this->ComputedCompressOutput)
!     {   
!     std::string cdashVersion = 
!       this->GetCTestConfiguration("CDashVersion");
      //version >= 1.6?
      bool cdashSupportsGzip = cmSystemTools::VersionCompare(
--- 305,310 ----
  {
    if(!this->ComputedCompressOutput)
!     {
!     std::string cdashVersion = this->GetCDashVersion();
      //version >= 1.6?
      bool cdashSupportsGzip = cmSystemTools::VersionCompare(
***************
*** 320,323 ****
--- 319,335 ----
  
  //----------------------------------------------------------------------------
+ std::string cmCTest::GetCDashVersion()
+ {
+   //First query the server.  If that fails, fall back to the local setting
+   std::string response;
+   std::string url = "http://";
+   url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
+   
+   int res = cmSystemTools::HTTPRequest(url, cmSystemTools::HTTP_GET, response);
+   
+   return res ? this->GetCTestConfiguration("CDashVersion") : response;
+ }
+ 
+ //----------------------------------------------------------------------------
  cmCTest::Part cmCTest::GetPartFromName(const char* name)
  {