mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 13:51:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'instrumentation-post-workflow'

Browse Source 
956d36d3cd instrumentation: Add postCMakeWorkflow hook

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Alex Overchenko <aleksandr9809@gmail.com>
Merge-request: !11450
This commit is contained in:
Craig Scott
2025-12-08 00:27:04 +00:00
committed by Kitware Robot
parent eb7a8f8e85 956d36d3cd
commit c0eb0ad5ef
8 changed files with 100 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmInstrumentationQuery.cxx
View File

@@ -20,9 +20,9 @@ std::vector<std::string> const cmInstrumentationQuery::OptionString{
"cdashVerbose", "trace"
};
std::vector<std::string> const cmInstrumentationQuery::HookString{
"postGenerate", "preBuild", "postBuild",
"preCMakeBuild", "postCMakeBuild", "postCTest",
"postCMakeInstall", "prepareForCDash", "manual"
"postGenerate", "preBuild", "postBuild", "preCMakeBuild",
"postCMakeBuild", "postCTest", "postCMakeInstall", "postCMakeWorkflow",
"prepareForCDash", "manual"
};
namespace ErrorMessages {

1
Source/cmInstrumentationQuery.h
View File

@@ -31,6 +31,7 @@ public:
PostCMakeBuild,
PostCTest,
PostCMakeInstall,
PostCMakeWorkflow,
PrepareForCDash,
Manual
};

18
Source/cmake.cxx
View File

@@ -4208,6 +4208,7 @@ std::function<cmUVProcessChain::Status()> buildWorkflowStep(
int cmake::Workflow(std::string const& presetName,
WorkflowListPresets listPresets, WorkflowFresh fresh)
{
int exitStatus = 0;
#ifndef CMAKE_BOOTSTRAP
this->SetHomeDirectory(cmSystemTools::GetLogicalWorkingDirectory());
this->SetHomeOutputDirectory(cmSystemTools::GetLogicalWorkingDirectory());
@@ -4280,11 +4281,12 @@ int cmake::Workflow(std::string const& presetName,
std::vector<CalculatedStep> steps;
steps.reserve(expandedPreset->Steps.size());
int stepNumber = 1;
cmCMakePresetsGraph::ConfigurePreset const* configurePreset = {};
for (auto const& step : expandedPreset->Steps) {
switch (step.PresetType) {
case cmCMakePresetsGraph::WorkflowPreset::WorkflowStep::Type::
Configure: {
auto const* configurePreset = this->FindPresetForWorkflow(
configurePreset = this->FindPresetForWorkflow(
"configure"_s, settingsFile.ConfigurePresets, step);
if (!configurePreset) {
return 1;
@@ -4345,19 +4347,27 @@ int cmake::Workflow(std::string const& presetName,
<< std::flush;
cmUVProcessChain::Status const status = step.Action();
if (status.ExitStatus != 0) {
return static_cast<int>(status.ExitStatus);
exitStatus = static_cast<int>(status.ExitStatus);
break;
}
auto const codeReasonPair = status.GetException();
if (codeReasonPair.first != cmUVProcessChain::ExceptionCode::None) {
std::cout << "Step command ended abnormally: " << codeReasonPair.second
<< std::endl;
return status.SpawnResult != 0 ? status.SpawnResult : status.TermSignal;
exitStatus =
status.SpawnResult != 0 ? status.SpawnResult : status.TermSignal;
break;
}
first = false;
}
if (configurePreset) {
cmInstrumentation instrumentation(configurePreset->BinaryDir);
instrumentation.CollectTimingData(
cmInstrumentationQuery::Hook::PostCMakeWorkflow);
}
#endif
return 0;
return exitStatus;
}
void cmake::WatchUnusedCli(std::string const& var)