diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2014-08-13 21:58:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-18 15:22:18 (GMT) |
| commit | 653529ce55a9c33fa7378708793caac92a857794 (patch) | |
| tree | cd706ba90eae209193c25353581bef90b78b7460 /Source/CTest/cmCTestUpdateHandler.cxx | |
| parent | 39b5df2f3714c32d498fcb7c88f5bda456f75cb3 (diff) | |
| download | CMake-653529ce55a9c33fa7378708793caac92a857794.zip CMake-653529ce55a9c33fa7378708793caac92a857794.tar.gz CMake-653529ce55a9c33fa7378708793caac92a857794.tar.bz2 | |
CTest: Allow / to be in the build name, and be consistent with the build name
Prior to this change / was not allowed in the build name. This was tested
with a CDash server and worked. In addition the safe build name was not
used everywhere. This caused mismatched build names to be in the xml
files going to CDash which caused different rows to be created for the
same build.
Diffstat (limited to 'Source/CTest/cmCTestUpdateHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index fda61ea..68f5fe1 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -258,12 +258,13 @@ int cmCTestUpdateHandler::ProcessHandler() double elapsed_time_start = cmSystemTools::GetTime(); bool updated = vc->Update(); - + std::string buildname = cmCTest::SafeBuildIdField( + this->CTest->GetCTestConfiguration("BuildName")); os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" << "<Update mode=\"Client\" Generator=\"ctest-" << cmVersion::GetCMakeVersion() << "\">\n" << "\t<Site>" << this->CTest->GetCTestConfiguration("Site") << "</Site>\n" - << "\t<BuildName>" << this->CTest->GetCTestConfiguration("BuildName") + << "\t<BuildName>" << buildname << "</BuildName>\n" << "\t<BuildStamp>" << this->CTest->GetCurrentTag() << "-" << this->CTest->GetTestModelString() << "</BuildStamp>" << std::endl; |