diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-19 16:02:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-19 16:02:53 (GMT) |
| commit | ca7ec2e188a6f66546a0f5dc9e76a6f24c22bfa6 (patch) | |
| tree | c1f73a73297a147b3d1f6d78d41169ae0c93dc29 | |
| parent | f79e684678fb481c91586bd015d03bfb9e1a019b (diff) | |
| parent | da79075c4de45095d8f9eca5d2cc76711b79341e (diff) | |
| download | CMake-ca7ec2e188a6f66546a0f5dc9e76a6f24c22bfa6.zip CMake-ca7ec2e188a6f66546a0f5dc9e76a6f24c22bfa6.tar.gz CMake-ca7ec2e188a6f66546a0f5dc9e76a6f24c22bfa6.tar.bz2 | |
Merge topic 'ctest-done-hash'
da79075c4d CTest: Generate Done.xml before calculating its hash
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3563
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 1fa7988..54c4bae 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -266,15 +266,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( } } - upload_as += "&MD5="; - - if (cmSystemTools::IsOn(this->GetOption("InternalTest"))) { - upload_as += "bad_md5sum"; - } else { - upload_as += - 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 @@ -286,6 +277,15 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( this->CTest->GenerateDoneFile(); } + upload_as += "&MD5="; + + if (cmSystemTools::IsOn(this->GetOption("InternalTest"))) { + upload_as += "bad_md5sum"; + } else { + upload_as += + cmSystemTools::ComputeFileHash(local_file, cmCryptoHash::AlgoMD5); + } + if (!cmSystemTools::FileExists(local_file)) { cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find file: " << local_file << std::endl); |