cmCTestMultiProcessHandler: Factor out duplicate test finish logic

2 files changed, 38 insertions, 36 deletions

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 4a980d7585..453d5cb6c7 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -195,21 +195,7 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
     return true;
   }
 
-  for (auto& j : this->Tests) {
-    j.second.erase(test);
-  }
-
-  this->UnlockResources(test);
-  this->Completed++;
-  this->TestFinishMap[test] = true;
-  this->TestRunningMap[test] = false;
-  this->RunningCount -= GetProcessorsUsed(test);
-  testRun->EndTest(this->Completed, this->Total, false);
-  if (!this->Properties[test]->Disabled) {
-    this->Failed->push_back(this->Properties[test]->Name);
-  }
-  delete testRun;
-
+  this->FinishTestProcess(testRun, false);
   return false;
 }
 
@@ -424,31 +410,45 @@ bool cmCTestMultiProcessHandler::CheckOutput()
     }
   }
   for (cmCTestRunTest* p : finished) {
-    this->Completed++;
-    int test = p->GetIndex();
+    this->FinishTestProcess(p, true);
+  }
+  return true;
+}
+
+void cmCTestMultiProcessHandler::FinishTestProcess(cmCTestRunTest* runner,
+                                                   bool started)
+{
+  this->Completed++;
+
+  int test = runner->GetIndex();
+  auto properties = runner->GetTestProperties();
 
-    bool testResult = p->EndTest(this->Completed, this->Total, true);
-    if (p->StartAgain()) {
+  bool testResult = runner->EndTest(this->Completed, this->Total, started);
+  if (started) {
+    if (runner->StartAgain()) {
       this->Completed--; // remove the completed test because run again
-      continue;
-    }
-    if (testResult) {
-      this->Passed->push_back(p->GetTestProperties()->Name);
-    } else {
-      this->Failed->push_back(p->GetTestProperties()->Name);
-    }
-    for (auto& t : this->Tests) {
-      t.second.erase(test);
+      return;
     }
-    this->TestFinishMap[test] = true;
-    this->TestRunningMap[test] = false;
-    this->RunningTests.erase(p);
-    this->WriteCheckpoint(test);
-    this->UnlockResources(test);
-    this->RunningCount -= GetProcessorsUsed(test);
-    delete p;
+    this->RunningTests.erase(runner);
   }
-  return true;
+
+  if (testResult) {
+    this->Passed->push_back(properties->Name);
+  } else if (!properties->Disabled) {
+    this->Failed->push_back(properties->Name);
+  }
+
+  for (auto& t : this->Tests) {
+    t.second.erase(test);
+  }
+
+  this->TestFinishMap[test] = true;
+  this->TestRunningMap[test] = false;
+  this->WriteCheckpoint(test);
+  this->UnlockResources(test);
+  this->RunningCount -= GetProcessorsUsed(test);
+
+  delete runner;
 }
 
 void cmCTestMultiProcessHandler::UpdateCostData()
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index 77a0ed913b..80d6d4e493 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -98,6 +98,8 @@ protected:
   // Return true if there are still tests running
   // check all running processes for output and exit case
   bool CheckOutput();
+  void FinishTestProcess(cmCTestRunTest* runner, bool started);
+
   void RemoveTest(int index);
   // Check if we need to resume an interrupted test set
   void CheckResume();