[Cmake-commits] CMake branch, next, updated. v2.8.10-692-g3573b44

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3573b4485cb8cc027a4e56a0e02849b093acbcfb (commit)
       via  5c63fa3d25d5dcc62ae51e3b583a15105c0cd306 (commit)
       via  1cfaa2f1a00ab2b6a72dc2e681043317e41a3d0f (commit)
      from  79aee22598f4972c7833957e0807643c81e81e33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3573b4485cb8cc027a4e56a0e02849b093acbcfb
commit 3573b4485cb8cc027a4e56a0e02849b093acbcfb
Merge: 79aee22 5c63fa3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 1 17:05:29 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 1 17:05:29 2012 -0400

    Merge topic 'import-KWSys-subtree' into next
    
    5c63fa3 Merge branch 'ctest-SUBMIT_INDEX-cdash' into import-KWSys-subtree
    1cfaa2f CTest: Allow SUBMIT_INDEX with CDash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c63fa3d25d5dcc62ae51e3b583a15105c0cd306
commit 5c63fa3d25d5dcc62ae51e3b583a15105c0cd306
Merge: 17fb60b 1cfaa2f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 1 17:04:57 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 1 17:04:57 2012 -0400

    Merge branch 'ctest-SUBMIT_INDEX-cdash' into import-KWSys-subtree


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cfaa2f1a00ab2b6a72dc2e681043317e41a3d0f
commit 1cfaa2f1a00ab2b6a72dc2e681043317e41a3d0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 1 16:56:13 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 1 17:03:20 2012 -0400

    CTest: Allow SUBMIT_INDEX with CDash
    
    If CTEST_DROP_SITE_CDASH is true then SUBMIT_INDEX is supported.
    The Dart version does not matter because the server is not Dart.

diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 1957e04..0db2548 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -121,7 +121,7 @@ bool cmCTestHandlerCommand
     }
   if ( this->Values[ct_SUBMIT_INDEX] )
     {
-    if ( this->CTest->GetDartVersion() <= 1 )
+    if(!this->CTest->GetDropSiteCDash() && this->CTest->GetDartVersion() <= 1)
       {
       cmCTestLog(this->CTest, ERROR_MESSAGE,
         "Dart before version 2.0 does not support collecting submissions."
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 4aff64b..b12cf40 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -327,6 +327,7 @@ cmCTest::cmCTest()
   this->OutputLogFileLastTag   = -1;
   this->SuppressUpdatingCTestConfiguration = false;
   this->DartVersion            = 1;
+  this->DropSiteCDash          = false;
   this->OutputTestOutputOnTestFailure = false;
   this->ComputedCompressTestOutput = false;
   this->ComputedCompressMemCheckOutput = false;
@@ -653,6 +654,7 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
     = this->GetCTestConfiguration("SourceDirectory").c_str();
   std::string bld_dir = this->GetCTestConfiguration("BuildDirectory").c_str();
   this->DartVersion = 1;
+  this->DropSiteCDash = false;
   for(Part p = PartStart; p != PartCount; p = Part(p+1))
     {
     this->Parts[p].SubmitFiles.clear();
@@ -719,6 +721,7 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
       return false;
       }
     }
+  this->DropSiteCDash = mf->IsOn("CTEST_DROP_SITE_CDASH");
 
   if ( !this->Initialize(bld_dir.c_str(), command) )
     {
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 7c71b00..7baf0a2 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -384,6 +384,7 @@ public:
 
   //! Get the version of dart server
   int GetDartVersion() { return this->DartVersion; }
+  int GetDropSiteCDash() { return this->DropSiteCDash; }
 
   //! Add file to be submitted
   void AddSubmitFile(Part part, const char* name);
@@ -549,6 +550,7 @@ private:
   bool Quiet;
 
   int  DartVersion;
+  bool DropSiteCDash;
 
   std::vector<cmStdString> InitialCommandLineArguments;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestHandlerCommand.cxx |    2 +-
 Source/cmCTest.cxx                     |    3 +++
 Source/cmCTest.h                       |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake