mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-02 20:00:38 -06:00
presets: Remove unintended rerunFailed option from test presets
This was accidentally included after discussion in #21391 had decided to leave it out. It was never included in a release. Issue: #21391
This commit is contained in:
@@ -721,11 +721,6 @@ that may contain the following fields:
|
||||
|
||||
``json-v1``
|
||||
|
||||
``rerunFailed``
|
||||
|
||||
An optional bool. If true, equivalent to passing ``--rerun-failed`` on
|
||||
the command line.
|
||||
|
||||
``repeat``
|
||||
|
||||
An optional object specifying how to repeat tests. Equivalent to
|
||||
|
||||
@@ -631,8 +631,6 @@ auto const TestPresetExecutionHelper =
|
||||
PresetOptionalIntHelper, false)
|
||||
.Bind("showOnly"_s, &TestPreset::ExecutionOptions::ShowOnly,
|
||||
TestPresetOptionalExecutionShowOnlyHelper, false)
|
||||
.Bind("rerunFailed"_s, &TestPreset::ExecutionOptions::RerunFailed,
|
||||
PresetOptionalBoolHelper, false)
|
||||
.Bind("repeat"_s, &TestPreset::ExecutionOptions::Repeat,
|
||||
TestPresetOptionalExecutionRepeatHelper, false)
|
||||
.Bind("interactiveDebugging"_s,
|
||||
@@ -1340,7 +1338,6 @@ cmCMakePresetsFile::TestPreset::VisitPresetInherit(
|
||||
parentExecution.ResourceSpecFile);
|
||||
InheritOptionalValue(execution.TestLoad, parentExecution.TestLoad);
|
||||
InheritOptionalValue(execution.ShowOnly, parentExecution.ShowOnly);
|
||||
InheritOptionalValue(execution.RerunFailed, parentExecution.RerunFailed);
|
||||
InheritOptionalValue(execution.Repeat, parentExecution.Repeat);
|
||||
InheritOptionalValue(execution.InteractiveDebugging,
|
||||
parentExecution.InteractiveDebugging);
|
||||
|
||||
@@ -255,7 +255,6 @@ public:
|
||||
std::string ResourceSpecFile;
|
||||
cm::optional<int> TestLoad;
|
||||
cm::optional<ShowOnlyEnum> ShowOnly;
|
||||
cm::optional<bool> RerunFailed;
|
||||
|
||||
cm::optional<RepeatOptions> Repeat;
|
||||
cm::optional<bool> InteractiveDebugging;
|
||||
|
||||
@@ -2501,11 +2501,6 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
|
||||
}
|
||||
}
|
||||
|
||||
if (expandedPreset->Execution->RerunFailed.value_or(false)) {
|
||||
this->GetTestHandler()->SetPersistentOption("RerunFailed", "true");
|
||||
this->GetMemCheckHandler()->SetPersistentOption("RerunFailed", "true");
|
||||
}
|
||||
|
||||
if (expandedPreset->Execution->Repeat) {
|
||||
this->Impl->RepeatCount = expandedPreset->Execution->Repeat->Count;
|
||||
switch (expandedPreset->Execution->Repeat->Mode) {
|
||||
|
||||
Reference in New Issue
Block a user