cmCTestBuildAndTest: Adopt RunTest method

The method is now specific to this class.

Source/CTest/cmCTestBuildAndTest.cxx

@@ -3,17 +3,27 @@
 #include "cmCTestBuildAndTest.h"
 
 #include <chrono>
+#include <cstdint>
 #include <cstring>
 #include <ratio>
+#include <utility>
+
+#include <cmext/algorithm>
+
+#include <cm3p/uv.h>
 
 #include "cmBuildOptions.h"
 #include "cmCTest.h"
 #include "cmCTestTestHandler.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
+#include "cmProcessOutput.h"
 #include "cmState.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
+#include "cmUVHandlePtr.h"
+#include "cmUVProcessChain.h"
+#include "cmUVStream.h"
 #include "cmWorkingDirectory.h"
 #include "cmake.h"
 
@@ -83,6 +93,69 @@ int cmCTestBuildAndTest::RunCMake(std::ostringstream& out,
   return 0;
 }
 
+bool cmCTestBuildAndTest::RunTest(std::vector<std::string> const& argv,
+                                  std::string* output, int* retVal,
+                                  cmDuration timeout)
+{
+  std::vector<char> tempOutput;
+  if (output) {
+    output->clear();
+  }
+
+  cmUVProcessChainBuilder builder;
+  builder.AddCommand(argv).SetMergedBuiltinStreams();
+  auto chain = builder.Start();
+
+  cmProcessOutput processOutput(cmProcessOutput::Auto);
+  cm::uv_pipe_ptr outputStream;
+  outputStream.init(chain.GetLoop(), 0);
+  uv_pipe_open(outputStream, chain.OutputStream());
+  auto outputHandle = cmUVStreamRead(
+    outputStream,
+    [&output, &tempOutput](std::vector<char> data) {
+      if (output) {
+        cm::append(tempOutput, data.data(), data.data() + data.size());
+      }
+    },
+    []() {});
+
+  bool complete = chain.Wait(static_cast<uint64_t>(timeout.count() * 1000.0));
+  processOutput.DecodeText(tempOutput, tempOutput);
+  if (output && tempOutput.begin() != tempOutput.end()) {
+    output->append(tempOutput.data(), tempOutput.size());
+  }
+
+  bool result = false;
+
+  if (complete) {
+    auto const& status = chain.GetStatus(0);
+    auto exception = status.GetException();
+    switch (exception.first) {
+      case cmUVProcessChain::ExceptionCode::None:
+        *retVal = static_cast<int>(status.ExitStatus);
+        result = true;
+        break;
+      case cmUVProcessChain::ExceptionCode::Spawn: {
+        if (output) {
+          std::string outerr =
+            cmStrCat("\n*** ERROR executing: ", exception.second);
+          *output += outerr;
+        }
+      } break;
+      default: {
+        *retVal = status.TermSignal;
+        if (output) {
+          std::string outerr =
+            cmStrCat("\n*** Exception executing: ", exception.second);
+          *output += outerr;
+        }
+      } break;
+    }
+  }
+
+  return result;
+}
+
 class cmCTestBuildAndTestCaptureRAII
 {
   cmake& CM;
@@ -295,8 +368,7 @@ int cmCTestBuildAndTest::Run()
     }
   }
 
-  bool runTestRes =
-    this->CTest->RunTest(testCommand, &outs, &retval, remainingTime);
+  bool runTestRes = this->RunTest(testCommand, &outs, &retval, remainingTime);
 
   if (!runTestRes || retval != 0) {
     out << "Test command failed: " << testCommand[0] << "\n";

Source/CTest/cmCTestBuildAndTest.h

@@ -37,6 +37,8 @@ private:
 
   int RunCMake(std::ostringstream& out, std::string& cmakeOutString,
                cmake* cm);
+  bool RunTest(std::vector<std::string> const& args, std::string* output,
+               int* retVal, cmDuration timeout);
 
   std::string Output;
 

Source/cmCTest.cxx

@@ -1226,68 +1226,6 @@ bool cmCTest::RunMakeCommand(const std::string& command, std::string& output,
   return true;
 }
 
-bool cmCTest::RunTest(std::vector<std::string> const& argv,
-                      std::string* output, int* retVal, cmDuration timeout)
-{
-  std::vector<char> tempOutput;
-  if (output) {
-    output->clear();
-  }
-
-  cmUVProcessChainBuilder builder;
-  builder.AddCommand(argv).SetMergedBuiltinStreams();
-  auto chain = builder.Start();
-
-  cmProcessOutput processOutput(cmProcessOutput::Auto);
-  cm::uv_pipe_ptr outputStream;
-  outputStream.init(chain.GetLoop(), 0);
-  uv_pipe_open(outputStream, chain.OutputStream());
-  auto outputHandle = cmUVStreamRead(
-    outputStream,
-    [&output, &tempOutput](std::vector<char> data) {
-      if (output) {
-        cm::append(tempOutput, data.data(), data.data() + data.size());
-      }
-    },
-    []() {});
-
-  bool complete = chain.Wait(static_cast<uint64_t>(timeout.count() * 1000.0));
-  processOutput.DecodeText(tempOutput, tempOutput);
-  if (output && tempOutput.begin() != tempOutput.end()) {
-    output->append(tempOutput.data(), tempOutput.size());
-  }
-
-  bool result = false;
-
-  if (complete) {
-    auto const& status = chain.GetStatus(0);
-    auto exception = status.GetException();
-    switch (exception.first) {
-      case cmUVProcessChain::ExceptionCode::None:
-        *retVal = static_cast<int>(status.ExitStatus);
-        result = true;
-        break;
-      case cmUVProcessChain::ExceptionCode::Spawn: {
-        if (output) {
-          std::string outerr =
-            cmStrCat("\n*** ERROR executing: ", exception.second);
-          *output += outerr;
-        }
-      } break;
-      default: {
-        *retVal = status.TermSignal;
-        if (output) {
-          std::string outerr =
-            cmStrCat("\n*** Exception executing: ", exception.second);
-          *output += outerr;
-        }
-      } break;
-    }
-  }
-
-  return result;
-}
-
 std::string cmCTest::SafeBuildIdField(const std::string& value)
 {
   std::string safevalue(value);

Source/cmCTest.h

@@ -297,12 +297,6 @@ public:
   bool GetProduceXML();
   void SetProduceXML(bool v);
 
-  /**
-   * In --build-and-test, run the --test-command.
-   */
-  bool RunTest(std::vector<std::string> const& args, std::string* output,
-               int* retVal, cmDuration timeout);
-
   /**
    * Get the handler object
    */