Forráskód Böngészése

Merge topic 'cmuvprocesschain-finished'

22e5775cde cmUVProcessChain: Add Finished() method

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !8526
Kyle Edwards 2 éve
szülő
commit
99e80ea0ac

+ 5 - 0
Source/cmUVProcessChain.cxx

@@ -420,3 +420,8 @@ const cmUVProcessChain::Status* cmUVProcessChain::GetStatus(
   }
   return nullptr;
 }
+
+bool cmUVProcessChain::Finished() const
+{
+  return this->Data->ProcessesCompleted >= this->Data->Processes.size();
+}

+ 1 - 0
Source/cmUVProcessChain.h

@@ -90,6 +90,7 @@ public:
   bool Wait(int64_t milliseconds = -1);
   std::vector<const Status*> GetStatus() const;
   const Status* GetStatus(std::size_t index) const;
+  bool Finished() const;
 
 private:
   friend class cmUVProcessChainBuilder;

+ 12 - 0
Tests/CMakeLib/testUVProcessChain.cxx

@@ -148,6 +148,10 @@ static bool checkExecution(cmUVProcessChainBuilder& builder,
     printResults(status, status1);
     return false;
   }
+  if (chain->Finished()) {
+    std::cout << "Finished() returned true, should be false" << std::endl;
+    return false;
+  }
 
   if (chain->Wait(6000)) {
     std::cout << "Wait() returned true, should be false" << std::endl;
@@ -159,6 +163,10 @@ static bool checkExecution(cmUVProcessChainBuilder& builder,
     printResults(status, status2);
     return false;
   }
+  if (chain->Finished()) {
+    std::cout << "Finished() returned true, should be false" << std::endl;
+    return false;
+  }
 
   if (!chain->Wait()) {
     std::cout << "Wait() returned false, should be true" << std::endl;
@@ -170,6 +178,10 @@ static bool checkExecution(cmUVProcessChainBuilder& builder,
     printResults(status, status3);
     return false;
   }
+  if (!chain->Finished()) {
+    std::cout << "Finished() returned false, should be true" << std::endl;
+    return false;
+  }
 
   return true;
 }