kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2012-11-01 16:56:13 -04:00
parent 4075e1ca6c
commit 1cfaa2f1a0
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestHandlerCommand.cxx
View File

@ -121,7 +121,7 @@ bool cmCTestHandlerCommand
} }
if ( this->Values[ct_SUBMIT_INDEX] ) if ( this->Values[ct_SUBMIT_INDEX] )
{ {
if ( this->CTest->GetDartVersion() <= 1 ) if(!this->CTest->GetDropSiteCDash() && this->CTest->GetDartVersion() <= 1)
{ {
cmCTestLog(this->CTest, ERROR_MESSAGE, cmCTestLog(this->CTest, ERROR_MESSAGE,
"Dart before version 2.0 does not support collecting submissions." "Dart before version 2.0 does not support collecting submissions."

3
Source/cmCTest.cxx
View File

@ -327,6 +327,7 @@ cmCTest::cmCTest()
this->OutputLogFileLastTag = -1; this->OutputLogFileLastTag = -1;
this->SuppressUpdatingCTestConfiguration = false; this->SuppressUpdatingCTestConfiguration = false;
this->DartVersion = 1; this->DartVersion = 1;
this->DropSiteCDash = false;
this->OutputTestOutputOnTestFailure = false; this->OutputTestOutputOnTestFailure = false;
this->ComputedCompressTestOutput = false; this->ComputedCompressTestOutput = false;
this->ComputedCompressMemCheckOutput = false; this->ComputedCompressMemCheckOutput = false;
@ -653,6 +654,7 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
= this->GetCTestConfiguration("SourceDirectory").c_str(); = this->GetCTestConfiguration("SourceDirectory").c_str();
std::string bld_dir = this->GetCTestConfiguration("BuildDirectory").c_str(); std::string bld_dir = this->GetCTestConfiguration("BuildDirectory").c_str();
this->DartVersion = 1; this->DartVersion = 1;
this->DropSiteCDash = false;
for(Part p = PartStart; p != PartCount; p = Part(p+1)) for(Part p = PartStart; p != PartCount; p = Part(p+1))
{ {
this->Parts[p].SubmitFiles.clear(); this->Parts[p].SubmitFiles.clear();
@ -719,6 +721,7 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
return false; return false;
} }
} }
this->DropSiteCDash = mf->IsOn("CTEST_DROP_SITE_CDASH");
if ( !this->Initialize(bld_dir.c_str(), command) ) if ( !this->Initialize(bld_dir.c_str(), command) )
{ {

2
Source/cmCTest.h
View File

@ -384,6 +384,7 @@ public:
//! Get the version of dart server //! Get the version of dart server
int GetDartVersion() { return this->DartVersion; } int GetDartVersion() { return this->DartVersion; }
int GetDropSiteCDash() { return this->DropSiteCDash; }
//! Add file to be submitted //! Add file to be submitted
void AddSubmitFile(Part part, const char* name); void AddSubmitFile(Part part, const char* name);
@ -549,6 +550,7 @@ private:
bool Quiet; bool Quiet;
int DartVersion; int DartVersion;
bool DropSiteCDash;
std::vector<cmStdString> InitialCommandLineArguments; std::vector<cmStdString> InitialCommandLineArguments;