Преглед на файлове

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

Merge-request: !3563
Brad King преди 6 години
родител
ревизия
fc2a7c8b3f
променени са 1 файла, в които са добавени 9 реда и са изтрити 9 реда
  1. 9 9
      Source/CTest/cmCTestSubmitHandler.cxx

+ 9 - 9
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);