diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-04-24 13:30:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-24 13:30:42 (GMT) |
| commit | a7eb2877b87117fb02ae4d3b730361defca4a96d (patch) | |
| tree | 82cd9a0dd574b178eaeb57fdb6e77f9cdcecb93d /Source | |
| parent | 993dfa89d8f49e06d44e86c97502a5d7630f3dcf (diff) | |
| parent | d8af0700a3cf1391f33c5585c4d19e331d968d4a (diff) | |
| download | CMake-a7eb2877b87117fb02ae4d3b730361defca4a96d.zip CMake-a7eb2877b87117fb02ae4d3b730361defca4a96d.tar.gz CMake-a7eb2877b87117fb02ae4d3b730361defca4a96d.tar.bz2 | |
Merge topic 'ctest_xml_tweaks'
d8af0700a3 ctest: consistently format generator name
95db11fdb1 ctest: Include ChangeId in Update.xml
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3259
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 4 | ||||
| -rw-r--r-- | Source/CTest/cmCTestUploadHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index e3b7e9e..5cfc4a7 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -199,6 +199,10 @@ int cmCTestUpdateHandler::ProcessHandler() xml.Element("UpdateCommand", vc->GetUpdateCommandLine()); xml.Element("UpdateType", cmCTestUpdateHandlerUpdateToString(this->UpdateType)); + std::string changeId = this->CTest->GetCTestConfiguration("ChangeId"); + if (!changeId.empty()) { + xml.Element("ChangeId", changeId); + } bool loadedMods = vc->WriteXML(xml); diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx index ee9ee91..9efdf70 100644 --- a/Source/CTest/cmCTestUploadHandler.cxx +++ b/Source/CTest/cmCTestUploadHandler.cxx @@ -51,7 +51,7 @@ int cmCTestUploadHandler::ProcessHandler() this->CTest->GetTestModelString()); xml.Attribute("Name", this->CTest->GetCTestConfiguration("Site")); xml.Attribute("Generator", - std::string("ctest") + cmVersion::GetCMakeVersion()); + std::string("ctest-") + cmVersion::GetCMakeVersion()); this->CTest->AddSiteProperties(xml); xml.StartElement("Upload"); diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 709feac..003ebdc 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1523,7 +1523,7 @@ int cmCTest::GenerateCTestNotesOutput(cmXMLWriter& xml, this->Impl->CurrentTag + "-" + this->GetTestModelString()); xml.Attribute("Name", this->GetCTestConfiguration("Site")); xml.Attribute("Generator", - std::string("ctest") + cmVersion::GetCMakeVersion()); + std::string("ctest-") + cmVersion::GetCMakeVersion()); this->AddSiteProperties(xml); xml.StartElement("Notes"); |