diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-06 14:14:13 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-06 14:14:13 -0500 |
| commit | da6b0ffe5d7cb44bf24ee8ed694b9f25e15e82c3 (patch) | |
| tree | 8c34f13509fd17735a2e247f57d58e7ae320b7c8 /Source | |
| parent | 7fa265d79e1e037b8bcdf5527ef75995e26b0ebb (diff) | |
| parent | 1cfaa2f1a00ab2b6a72dc2e681043317e41a3d0f (diff) | |
| download | cmake-da6b0ffe5d7cb44bf24ee8ed694b9f25e15e82c3.tar.gz | |
Merge topic 'ctest-SUBMIT_INDEX-cdash'
1cfaa2f CTest: Allow SUBMIT_INDEX with CDash
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestHandlerCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 3 | ||||
| -rw-r--r-- | Source/cmCTest.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 0da8aae527..453e32ce2b 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 a6d04b70d4..bb6f3f29dc 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 f2638feda2..587a6db51a 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); @@ -561,6 +562,7 @@ private: bool Quiet; int DartVersion; + bool DropSiteCDash; std::vector<cmStdString> InitialCommandLineArguments; |