From 20b35ef62257aa1f6e146fa7eea0e9016a252ea5 Mon Sep 17 00:00:00 2001
From: Daniel Pfeifer <daniel@pfeifer-mail.de>
Date: Tue, 22 Oct 2024 00:07:47 +0200
Subject: [PATCH] cmCTestBuildCommand: Make use of ProcessAdditionalValues

---
 Source/CTest/cmCTestBuildCommand.cxx   | 19 +++++++------------
 Source/CTest/cmCTestBuildCommand.h     |  8 +-------
 Source/CTest/cmCTestBuildHandler.h     |  4 ++--
 Source/CTest/cmCTestHandlerCommand.cxx |  4 ----
 Source/CTest/cmCTestHandlerCommand.h   |  7 +------
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index 410a35eeaa..94c6ad5a16 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -18,8 +18,6 @@
 #include "cmValue.h"
 #include "cmake.h"
 
-class cmExecutionStatus;
-
 std::unique_ptr<cmCommand> cmCTestBuildCommand::Clone()
 {
   auto ni = cm::make_unique<cmCTestBuildCommand>();
@@ -46,8 +44,6 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
   cmCTestBuildHandler* handler = this->CTest->GetBuildHandler();
   handler->Initialize();
 
-  this->Handler = handler;
-
   cmValue ctestBuildCommand =
     this->Makefile->GetDefinition("CTEST_BUILD_COMMAND");
   if (cmNonempty(ctestBuildCommand)) {
@@ -140,17 +136,16 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
   return handler;
 }
 
-bool cmCTestBuildCommand::InitialPass(std::vector<std::string> const& args,
-                                      cmExecutionStatus& status)
+void cmCTestBuildCommand::ProcessAdditionalValues(
+  cmCTestGenericHandler* generic)
 {
-  bool ret = this->cmCTestHandlerCommand::InitialPass(args, status);
+  auto const* handler = static_cast<cmCTestBuildHandler*>(generic);
   if (!this->NumberErrors.empty()) {
-    this->Makefile->AddDefinition(
-      this->NumberErrors, std::to_string(this->Handler->GetTotalErrors()));
+    this->Makefile->AddDefinition(this->NumberErrors,
+                                  std::to_string(handler->GetTotalErrors()));
   }
   if (!this->NumberWarnings.empty()) {
-    this->Makefile->AddDefinition(
-      this->NumberWarnings, std::to_string(this->Handler->GetTotalWarnings()));
+    this->Makefile->AddDefinition(this->NumberWarnings,
+                                  std::to_string(handler->GetTotalWarnings()));
   }
-  return ret;
 }
diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h
index 3b7f4f9e43..c1f711e1a2 100644
--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@@ -5,16 +5,13 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <string>
-#include <vector>
 
 #include <cm/memory>
 
 #include "cmCTestHandlerCommand.h"
 
 class cmCommand;
-class cmCTestBuildHandler;
 class cmCTestGenericHandler;
-class cmExecutionStatus;
 class cmGlobalGenerator;
 
 /** \class cmCTestBuild
@@ -37,13 +34,10 @@ public:
    */
   std::string GetName() const override { return "ctest_build"; }
 
-  bool InitialPass(std::vector<std::string> const& args,
-                   cmExecutionStatus& status) override;
-
   std::unique_ptr<cmGlobalGenerator> GlobalGenerator;
 
 protected:
-  cmCTestBuildHandler* Handler;
+  void ProcessAdditionalValues(cmCTestGenericHandler* handler) override;
   void BindArguments() override;
   cmCTestGenericHandler* InitializeHandler() override;
 
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 90945b16be..0ea258e7de 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -45,8 +45,8 @@ public:
    */
   void Initialize() override;
 
-  int GetTotalErrors() { return this->TotalErrors; }
-  int GetTotalWarnings() { return this->TotalWarnings; }
+  int GetTotalErrors() const { return this->TotalErrors; }
+  int GetTotalWarnings() const { return this->TotalWarnings; }
 
 private:
   std::string GetMakeCommand();
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 753ec0f3b8..9313194466 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -223,10 +223,6 @@ bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args,
   return true;
 }
 
-void cmCTestHandlerCommand::ProcessAdditionalValues(cmCTestGenericHandler*)
-{
-}
-
 void cmCTestHandlerCommand::BindArguments()
 {
   this->BindParsedKeywords(this->ParsedKeywords);
diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h
index ed6d9af581..de32e9ea3a 100644
--- a/Source/CTest/cmCTestHandlerCommand.h
+++ b/Source/CTest/cmCTestHandlerCommand.h
@@ -40,7 +40,7 @@ public:
 protected:
   virtual cmCTestGenericHandler* InitializeHandler() = 0;
 
-  virtual void ProcessAdditionalValues(cmCTestGenericHandler* handler);
+  virtual void ProcessAdditionalValues(cmCTestGenericHandler* /*handler*/) {}
 
   // Command argument handling.
   virtual void BindArguments();
@@ -55,8 +55,3 @@ protected:
   std::string Source;
   std::string SubmitIndex;
 };
-
-#define CTEST_COMMAND_APPEND_OPTION_DOCS                                      \
-  "The APPEND option marks results for append to those previously "           \
-  "submitted to a dashboard server since the last ctest_start.  "             \
-  "Append semantics are defined by the dashboard server in use."