Commit fc2a7c8b authored by Brad King's avatar Brad King

Merge branch 'ctest-done-hash' into release-3.15

Merge-request: !3563
parents 8d229997 da79075c
...@@ -266,15 +266,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( ...@@ -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. // Generate Done.xml right before it is submitted.
// The reason for this is two-fold: // The reason for this is two-fold:
// 1) It must be generated after some other part has been submitted // 1) It must be generated after some other part has been submitted
...@@ -286,6 +277,15 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( ...@@ -286,6 +277,15 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
this->CTest->GenerateDoneFile(); 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)) { if (!cmSystemTools::FileExists(local_file)) {
cmCTestLog(this->CTest, ERROR_MESSAGE, cmCTestLog(this->CTest, ERROR_MESSAGE,
" Cannot find file: " << local_file << std::endl); " Cannot find file: " << local_file << std::endl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment