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:
Sam Freed
2021-02-12 11:49:03 -08:00
committed by Brad King
parent 7f2203ab4a
commit 7fd6bb6895
4 changed files with 0 additions and 14 deletions

View File

@@ -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

View File

@@ -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);

View File

@@ -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;

View File

@@ -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) {