mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

ctest_submit: Generate Done.xml at submit time

Browse Source 
This fixes a bug where calling `ctest_submit()` would result in a Done.xml
file with an empty <buildId> element.

CDash responds with a buildId when CTest submits a file. For this reason,
Done.xml needs to generated after CTest has submitted some other file to
CDash. This change also has the benefit of making Done.xml's timestamp as
late as possible, giving us a more accurate record of how long the entire
build took to complete.
This commit is contained in:
Zack Galbreath
2018-10-11 13:48:53 -04:00
parent e2dd6ac977
commit 60ca88d726
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/CTest/cmCTestSubmitHandler.cxx
View File

@@ -467,6 +467,17 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
cmSystemTools::ComputeFileHash(local_file, cmCryptoHash::AlgoMD5);
}
// Generate Done.xml right before it is submitted.
// The reason for this is two-fold:
// 1) It must be generated after some other part has been submitted
// so we have a buildId to refer to in its contents.
// 2) By generating Done.xml here its timestamp will be as late as
// possible. This gives us a more accurate record of how long the
// entire build took to complete.
if (file == "Done.xml") {
this->CTest->GenerateDoneFile();
}
if (!cmSystemTools::FileExists(local_file)) {
cmCTestLog(this->CTest, ERROR_MESSAGE,
" Cannot find file: " << local_file << std::endl);
@@ -1420,7 +1431,6 @@ int cmCTestSubmitHandler::ProcessHandler()
// Submit Done.xml last
if (this->SubmitPart[cmCTest::PartDone]) {
this->CTest->GenerateDoneFile();
files.push_back("Done.xml");
}