diff options
| author | Regina Pfeifer <regina@mailbox.org> | 2018-11-27 23:10:14 (GMT) |
|---|---|---|
| committer | Regina Pfeifer <regina@mailbox.org> | 2018-11-28 23:29:13 (GMT) |
| commit | 9501a6145dfc5d3905d6b241d6599806ec40fd38 (patch) | |
| tree | 5e93bd74070d68adacee9cc162dff57df7f482ed /Source/CTest | |
| parent | e184603378e85046fb6e4d627f47e9853577486e (diff) | |
| download | CMake-9501a6145dfc5d3905d6b241d6599806ec40fd38.zip CMake-9501a6145dfc5d3905d6b241d6599806ec40fd38.tar.gz CMake-9501a6145dfc5d3905d6b241d6599806ec40fd38.tar.bz2 | |
CTest: Remove special case for Dart version <= 1
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestHandlerCommand.cxx | 13 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmitCommand.cxx | 4 |
2 files changed, 1 insertions, 16 deletions
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 667a8ba..c63694d 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -206,18 +206,7 @@ bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args, handler->PopulateCustomVectors(this->Makefile); if (this->Values[ct_SUBMIT_INDEX]) { - if (!this->CTest->GetDropSiteCDash() && - this->CTest->GetDartVersion() <= 1) { - cmCTestLog( - this->CTest, ERROR_MESSAGE, - "Dart before version 2.0 does not support collecting submissions." - << std::endl - << "Please upgrade the server to Dart 2 or higher, or do not use " - "SUBMIT_INDEX." - << std::endl); - } else { - handler->SetSubmitIndex(atoi(this->Values[ct_SUBMIT_INDEX])); - } + handler->SetSubmitIndex(atoi(this->Values[ct_SUBMIT_INDEX])); } cmWorkingDirectory workdir( this->CTest->GetCTestConfiguration("BuildDirectory")); diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 2165f40..43bd636 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -20,7 +20,6 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler() const char* ctestDropSite = this->Makefile->GetDefinition("CTEST_DROP_SITE"); const char* ctestDropLocation = this->Makefile->GetDefinition("CTEST_DROP_LOCATION"); - bool ctestDropSiteCDash = this->Makefile->IsOn("CTEST_DROP_SITE_CDASH"); if (!ctestDropMethod) { ctestDropMethod = "http"; } @@ -39,9 +38,6 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler() this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation, this->Quiet); - this->CTest->SetCTestConfiguration( - "IsCDash", ctestDropSiteCDash ? "TRUE" : "FALSE", this->Quiet); - this->CTest->SetCTestConfigurationFromCMakeVariable( this->Makefile, "CurlOptions", "CTEST_CURL_OPTIONS", this->Quiet); this->CTest->SetCTestConfigurationFromCMakeVariable( |