From 2bb13f2ca5bad12a50378b47565e3c3ea3b69dcf Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 15 May 2009 15:39:43 -0400
Subject: ENH: Remove CTest public.kitware.com drop default

Previously CTest would drop dashboard submissions at public.kitware.com
on the PublicDashboard project if there was no configuration.  The
server no longer supports forwarding to cdash.org, so there is no point
in this default.  Furthermore, there should be no default at all because
it could leak information about proprietary projects that are not
configured correctly.
---
 Modules/CTest.cmake                   | 25 ----------------------
 Source/CTest/cmCTestSubmitCommand.cxx | 40 ++++++-----------------------------
 2 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake
index 342bbac..19f872a 100644
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
@@ -63,36 +63,11 @@ IF(BUILD_TESTING)
   IF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake")
     INCLUDE("${PROJECT_SOURCE_DIR}/DartConfig.cmake")
   ELSE(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake")
-
     # Dashboard is opened for submissions for a 24 hour period starting at
     # the specified NIGHTLY_START_TIME. Time is specified in 24 hour format.
     SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")
     SET_IF_NOT_SET(DROP_METHOD "http")
-
-    # Dart server to submit results (used by client)
-    # There should be an option to specify submit method, but I will leave it
-    # commented until we decide what to do with it.
-    # SET(DROP_METHOD "http" CACHE STRING "Set the CTest submit method. Valid options are http and ftp")
-    IF(DROP_METHOD MATCHES http)
-      SET_IF_NOT_SET (DROP_SITE "public.kitware.com")
-      SET_IF_NOT_SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi")
-    ELSE(DROP_METHOD MATCHES http)
-      SET_IF_NOT_SET (DROP_SITE "public.kitware.com")
-      SET_IF_NOT_SET (DROP_LOCATION "/incoming")
-      SET_IF_NOT_SET (DROP_SITE_USER "anonymous")
-      SET_IF_NOT_SET (DROP_SITE_PASSWORD "random@someplace.com")
-      SET_IF_NOT_SET (DROP_SITE_MODE "active")
-    ENDIF(DROP_METHOD MATCHES http)
-    SET_IF_NOT_SET (TRIGGER_SITE "http://${DROP_SITE}/cgi-bin/Submit-Random-TestingResults.cgi")
     SET_IF_NOT_SET (COMPRESS_SUBMISSION ON)
-
-    # Dart server configuration 
-    SET (ROLLUP_URL "http://${DROP_SITE}/cgi-bin/random-rollup-dashboard.sh")
-    #SET (CVS_WEB_URL "")
-    #SET (CVS_WEB_CVSROOT "")
-
-    #SET (USE_DOXYGEN "Off")
-    #SET (DOXYGEN_URL "" )
   ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake")
   SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")
 
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 2b317a4..028edfe 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -38,43 +38,15 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
     ctestDropMethod = "http";
     }
 
-  if ( ctestDropSiteCDash )
+  if ( !ctestDropSite )
     {
-    // 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
-      }
+    // error: CDash requires CTEST_DROP_SITE definition
+    // in CTestConfig.cmake
     }
-  else
+  if ( !ctestDropLocation )
     {
-    // 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;);
-      }
+    // error: CDash requires CTEST_DROP_LOCATION definition
+    // in CTestConfig.cmake
     }
 
   this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod);
-- 
cgit v0.12