Skip to content

Commit fc2a7c8

Browse files
committed
Merge branch 'ctest-done-hash' into release-3.15
Merge-request: !3563
2 parents 8d22999 + da79075 commit fc2a7c8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Source/CTest/cmCTestSubmitHandler.cxx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
266266
}
267267
}
268268

269-
upload_as += "&MD5=";
270-
271-
if (cmSystemTools::IsOn(this->GetOption("InternalTest"))) {
272-
upload_as += "bad_md5sum";
273-
} else {
274-
upload_as +=
275-
cmSystemTools::ComputeFileHash(local_file, cmCryptoHash::AlgoMD5);
276-
}
277-
278269
// Generate Done.xml right before it is submitted.
279270
// The reason for this is two-fold:
280271
// 1) It must be generated after some other part has been submitted
@@ -286,6 +277,15 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(
286277
this->CTest->GenerateDoneFile();
287278
}
288279

280+
upload_as += "&MD5=";
281+
282+
if (cmSystemTools::IsOn(this->GetOption("InternalTest"))) {
283+
upload_as += "bad_md5sum";
284+
} else {
285+
upload_as +=
286+
cmSystemTools::ComputeFileHash(local_file, cmCryptoHash::AlgoMD5);
287+
}
288+
289289
if (!cmSystemTools::FileExists(local_file)) {
290290
cmCTestLog(this->CTest, ERROR_MESSAGE,
291291
" Cannot find file: " << local_file << std::endl);

0 commit comments

Comments
 (0)