[Cmake-commits] [cmake-commits] hoffman committed cmCTestSubmitCommand.cxx 1.13 1.13.12.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCTestSubmitCommand.cxx 
Log Message:
ENH: next RC


Index: cmCTestSubmitCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSubmitCommand.cxx,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -C 2 -d -r1.13 -r1.13.12.1
*** cmCTestSubmitCommand.cxx	29 Mar 2006 17:33:41 -0000	1.13
--- cmCTestSubmitCommand.cxx	31 Mar 2009 14:29:12 -0000	1.13.12.1
***************
*** 30,33 ****
--- 30,35 ----
    const char* ctestTriggerSite
      = this->Makefile->GetDefinition("CTEST_TRIGGER_SITE");
+   bool ctestDropSiteCDash
+     = this->Makefile->IsOn("CTEST_DROP_SITE_CDASH");
  
    if ( !ctestDropMethod )
***************
*** 35,52 ****
      ctestDropMethod = "http";
      }
!   if ( !ctestDropSite )
!     {
!     ctestDropSite = "public.kitware.com";
!     }
!   if ( !ctestDropLocation )
      {
!     ctestDropLocation = "/cgi-bin/HTTPUploadDartFile.cgi";
      }
!   if ( !ctestTriggerSite )
      {
!     ctestTriggerSite
!       = "http://public.kitware.com/cgi-bin/Submit-Random-TestingResults.cgi";
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "* Use default trigger site: "
!       << ctestTriggerSite << std::endl;);
      }
  
--- 37,78 ----
      ctestDropMethod = "http";
      }
! 
!   if ( ctestDropSiteCDash )
      {
!     // drop site is a CDash server...
!     //
!     if ( !ctestDropSite )
!       {
!       // error: CDash requires CTEST_DROP_SITE definition
!       // in CTestConfig.cmake
!       }
!     if ( !ctestDropLocation )
!       {
!       // error: CDash requires CTEST_DROP_LOCATION definition
!       // in CTestConfig.cmake
!       }
      }
!   else
      {
!     // drop site is a *NOT* a CDash server...
!     //
!     // Keep all this code in case anybody out there is still
!     // using newer CMake with non-CDash servers
!     //
!     if ( !ctestDropSite )
!       {
!       ctestDropSite = "public.kitware.com";
!       }
!     if ( !ctestDropLocation )
!       {
!       ctestDropLocation = "/cgi-bin/HTTPUploadDartFile.cgi";
!       }
!     if ( !ctestTriggerSite )
!       {
!       ctestTriggerSite
!         = "http://public.kitware.com/cgi-bin/Submit-Random-TestingResults.cgi";
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, "* Use default trigger site: "
!         << ctestTriggerSite << std::endl;);
!       }
      }
  
***************
*** 54,58 ****
    this->CTest->SetCTestConfiguration("DropSite",     ctestDropSite);
    this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation);
!   this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite);
  
    this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
--- 80,93 ----
    this->CTest->SetCTestConfiguration("DropSite",     ctestDropSite);
    this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation);
! 
!   this->CTest->SetCTestConfiguration("IsCDash",
!     ctestDropSiteCDash ? "TRUE" : "FALSE");
! 
!   // Only propagate TriggerSite for non-CDash projects:
!   //
!   if ( !ctestDropSiteCDash )
!     {
!     this->CTest->SetCTestConfiguration("TriggerSite",  ctestTriggerSite);
!     }
  
    this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,