mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-08 14:50:10 -06:00
cmCTestConfigureHandler: Move class into cmCTestConfigureCommand.cxx
Place declaration and definitions into places where following refactoring will cause minimal deltas.
This commit is contained in:
Daniel Pfeifer
@@ -1062,7 +1062,6 @@ add_library(
|
||||
CTest/cmCTestBuildHandler.cxx
|
||||
CTest/cmCTestCommand.cxx
|
||||
CTest/cmCTestConfigureCommand.cxx
|
||||
CTest/cmCTestConfigureHandler.cxx
|
||||
CTest/cmCTestCoverageCommand.cxx
|
||||
CTest/cmCTestCoverageHandler.cxx
|
||||
CTest/cmCTestCurl.cxx
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
file Copyright.txt or https://cmake.org/licensing for details. */
|
||||
#include "cmCTestConfigureCommand.h"
|
||||
|
||||
#include <chrono>
|
||||
#include <cstring>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
@@ -12,17 +14,30 @@
|
||||
|
||||
#include "cmArgumentParser.h"
|
||||
#include "cmCTest.h"
|
||||
#include "cmCTestConfigureHandler.h"
|
||||
#include "cmCTestGenericHandler.h"
|
||||
#include "cmDuration.h"
|
||||
#include "cmExecutionStatus.h"
|
||||
#include "cmGeneratedFileStream.h"
|
||||
#include "cmGlobalGenerator.h"
|
||||
#include "cmList.h"
|
||||
#include "cmMakefile.h"
|
||||
#include "cmStringAlgorithms.h"
|
||||
#include "cmSystemTools.h"
|
||||
#include "cmValue.h"
|
||||
#include "cmXMLWriter.h"
|
||||
#include "cmake.h"
|
||||
|
||||
class cmCTestConfigureHandler : public cmCTestGenericHandler
|
||||
{
|
||||
public:
|
||||
cmCTestConfigureHandler(cmCTest* ctest)
|
||||
: cmCTestGenericHandler(ctest)
|
||||
{
|
||||
}
|
||||
|
||||
int ProcessHandler() override;
|
||||
};
|
||||
|
||||
std::unique_ptr<cmCTestGenericHandler>
|
||||
cmCTestConfigureCommand::InitializeHandler(HandlerArguments& arguments,
|
||||
cmExecutionStatus& status) const
|
||||
@@ -157,6 +172,88 @@ cmCTestConfigureCommand::InitializeHandler(HandlerArguments& arguments,
|
||||
return std::unique_ptr<cmCTestGenericHandler>(std::move(handler));
|
||||
}
|
||||
|
||||
int cmCTestConfigureHandler::ProcessHandler()
|
||||
{
|
||||
cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
|
||||
"Configure project" << std::endl, this->Quiet);
|
||||
std::string cCommand =
|
||||
this->CTest->GetCTestConfiguration("ConfigureCommand");
|
||||
if (cCommand.empty()) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Cannot find ConfigureCommand key in the DartConfiguration.tcl"
|
||||
<< std::endl);
|
||||
return -1;
|
||||
}
|
||||
|
||||
std::string buildDirectory =
|
||||
this->CTest->GetCTestConfiguration("BuildDirectory");
|
||||
if (buildDirectory.empty()) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Cannot find BuildDirectory key in the DartConfiguration.tcl"
|
||||
<< std::endl);
|
||||
return -1;
|
||||
}
|
||||
|
||||
auto elapsed_time_start = std::chrono::steady_clock::now();
|
||||
std::string output;
|
||||
int retVal = 0;
|
||||
bool res = false;
|
||||
if (!this->CTest->GetShowOnly()) {
|
||||
cmGeneratedFileStream os;
|
||||
if (!this->StartResultingXML(cmCTest::PartConfigure, "Configure", os)) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Cannot open configure file" << std::endl);
|
||||
return 1;
|
||||
}
|
||||
std::string start_time = this->CTest->CurrentTime();
|
||||
auto start_time_time = std::chrono::system_clock::now();
|
||||
|
||||
cmGeneratedFileStream ofs;
|
||||
this->StartLogFile("Configure", ofs);
|
||||
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
|
||||
"Configure with command: " << cCommand << std::endl,
|
||||
this->Quiet);
|
||||
res = this->CTest->RunMakeCommand(cCommand, output, &retVal,
|
||||
buildDirectory.c_str(),
|
||||
cmDuration::zero(), ofs);
|
||||
|
||||
if (ofs) {
|
||||
ofs.close();
|
||||
}
|
||||
|
||||
if (os) {
|
||||
cmXMLWriter xml(os);
|
||||
this->CTest->StartXML(xml, this->CMake, this->AppendXML);
|
||||
this->CTest->GenerateSubprojectsOutput(xml);
|
||||
xml.StartElement("Configure");
|
||||
xml.Element("StartDateTime", start_time);
|
||||
xml.Element("StartConfigureTime", start_time_time);
|
||||
xml.Element("ConfigureCommand", cCommand);
|
||||
cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
|
||||
xml.Element("Log", output);
|
||||
xml.Element("ConfigureStatus", retVal);
|
||||
xml.Element("EndDateTime", this->CTest->CurrentTime());
|
||||
xml.Element("EndConfigureTime", std::chrono::system_clock::now());
|
||||
xml.Element("ElapsedMinutes",
|
||||
std::chrono::duration_cast<std::chrono::minutes>(
|
||||
std::chrono::steady_clock::now() - elapsed_time_start)
|
||||
.count());
|
||||
xml.EndElement(); // Configure
|
||||
this->CTest->EndXML(xml);
|
||||
}
|
||||
} else {
|
||||
cmCTestOptionalLog(this->CTest, DEBUG,
|
||||
"Configure with command: " << cCommand << std::endl,
|
||||
this->Quiet);
|
||||
}
|
||||
if (!res || retVal) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Error(s) when configuring the project" << std::endl);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool cmCTestConfigureCommand::InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus& status) const
|
||||
{
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
file Copyright.txt or https://cmake.org/licensing for details. */
|
||||
#include "cmCTestConfigureHandler.h"
|
||||
|
||||
#include <chrono>
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
|
||||
#include "cmCTest.h"
|
||||
#include "cmDuration.h"
|
||||
#include "cmGeneratedFileStream.h"
|
||||
#include "cmXMLWriter.h"
|
||||
|
||||
cmCTestConfigureHandler::cmCTestConfigureHandler(cmCTest* ctest)
|
||||
: Superclass(ctest)
|
||||
{
|
||||
}
|
||||
|
||||
// clearly it would be nice if this were broken up into a few smaller
|
||||
// functions and commented...
|
||||
int cmCTestConfigureHandler::ProcessHandler()
|
||||
{
|
||||
cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
|
||||
"Configure project" << std::endl, this->Quiet);
|
||||
std::string cCommand =
|
||||
this->CTest->GetCTestConfiguration("ConfigureCommand");
|
||||
if (cCommand.empty()) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Cannot find ConfigureCommand key in the DartConfiguration.tcl"
|
||||
<< std::endl);
|
||||
return -1;
|
||||
}
|
||||
|
||||
std::string buildDirectory =
|
||||
this->CTest->GetCTestConfiguration("BuildDirectory");
|
||||
if (buildDirectory.empty()) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Cannot find BuildDirectory key in the DartConfiguration.tcl"
|
||||
<< std::endl);
|
||||
return -1;
|
||||
}
|
||||
|
||||
auto elapsed_time_start = std::chrono::steady_clock::now();
|
||||
std::string output;
|
||||
int retVal = 0;
|
||||
bool res = false;
|
||||
if (!this->CTest->GetShowOnly()) {
|
||||
cmGeneratedFileStream os;
|
||||
if (!this->StartResultingXML(cmCTest::PartConfigure, "Configure", os)) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Cannot open configure file" << std::endl);
|
||||
return 1;
|
||||
}
|
||||
std::string start_time = this->CTest->CurrentTime();
|
||||
auto start_time_time = std::chrono::system_clock::now();
|
||||
|
||||
cmGeneratedFileStream ofs;
|
||||
this->StartLogFile("Configure", ofs);
|
||||
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
|
||||
"Configure with command: " << cCommand << std::endl,
|
||||
this->Quiet);
|
||||
res = this->CTest->RunMakeCommand(cCommand, output, &retVal,
|
||||
buildDirectory.c_str(),
|
||||
cmDuration::zero(), ofs);
|
||||
|
||||
if (ofs) {
|
||||
ofs.close();
|
||||
}
|
||||
|
||||
if (os) {
|
||||
cmXMLWriter xml(os);
|
||||
this->CTest->StartXML(xml, this->CMake, this->AppendXML);
|
||||
this->CTest->GenerateSubprojectsOutput(xml);
|
||||
xml.StartElement("Configure");
|
||||
xml.Element("StartDateTime", start_time);
|
||||
xml.Element("StartConfigureTime", start_time_time);
|
||||
xml.Element("ConfigureCommand", cCommand);
|
||||
cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
|
||||
xml.Element("Log", output);
|
||||
xml.Element("ConfigureStatus", retVal);
|
||||
xml.Element("EndDateTime", this->CTest->CurrentTime());
|
||||
xml.Element("EndConfigureTime", std::chrono::system_clock::now());
|
||||
xml.Element("ElapsedMinutes",
|
||||
std::chrono::duration_cast<std::chrono::minutes>(
|
||||
std::chrono::steady_clock::now() - elapsed_time_start)
|
||||
.count());
|
||||
xml.EndElement(); // Configure
|
||||
this->CTest->EndXML(xml);
|
||||
}
|
||||
} else {
|
||||
cmCTestOptionalLog(this->CTest, DEBUG,
|
||||
"Configure with command: " << cCommand << std::endl,
|
||||
this->Quiet);
|
||||
}
|
||||
if (!res || retVal) {
|
||||
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||
"Error(s) when configuring the project" << std::endl);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
file Copyright.txt or https://cmake.org/licensing for details. */
|
||||
#pragma once
|
||||
|
||||
#include "cmConfigure.h" // IWYU pragma: keep
|
||||
|
||||
#include "cmCTestGenericHandler.h"
|
||||
|
||||
class cmCTest;
|
||||
|
||||
/** \class cmCTestConfigureHandler
|
||||
* \brief A class that handles ctest -S invocations
|
||||
*
|
||||
*/
|
||||
class cmCTestConfigureHandler : public cmCTestGenericHandler
|
||||
{
|
||||
public:
|
||||
using Superclass = cmCTestGenericHandler;
|
||||
|
||||
/*
|
||||
* The main entry point for this class
|
||||
*/
|
||||
int ProcessHandler() override;
|
||||
|
||||
cmCTestConfigureHandler(cmCTest* ctest);
|
||||
};
|
||||
Reference in New Issue
Block a user