diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-16 15:02:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-16 15:02:58 (GMT) |
| commit | 73d9d53ed0333f76e8ded6a91d34fbc43111ab27 (patch) | |
| tree | c871aea6d157aaa45853fe6c58c3817d71482d9f /Source | |
| parent | 92f3ad7caebe6922a6b682cbb8c8d687cbfc8256 (diff) | |
| parent | 60ca88d7261da8ad77e68d8f82ae67099af70df0 (diff) | |
| download | CMake-73d9d53ed0333f76e8ded6a91d34fbc43111ab27.zip CMake-73d9d53ed0333f76e8ded6a91d34fbc43111ab27.tar.gz CMake-73d9d53ed0333f76e8ded6a91d34fbc43111ab27.tar.bz2 | |
Merge topic 'ctest_done_bug_fix'
60ca88d726 ctest_submit: Generate Done.xml at submit time
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2477
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 6ad0e03..98872a5 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -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"); } |