Commit 67835d9a authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'preset-fixes' into release-3.20

121d6029 presets: Inherit 'quiet' property for test presets
7fd6bb68

 presets: Remove unintended rerunFailed option from test presets
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5808
parents e6d6cf90 121d6029
Pipeline #214485 waiting for manual action with stages
in 11 minutes and 43 seconds
......@@ -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,
......@@ -1280,6 +1278,7 @@ cmCMakePresetsFile::TestPreset::VisitPresetInherit(
InheritOptionalValue(output.Debug, parentOutput.Debug);
InheritOptionalValue(output.OutputOnFailure,
parentOutput.OutputOnFailure);
InheritOptionalValue(output.Quiet, parentOutput.Quiet);
InheritString(output.OutputLogFile, parentOutput.OutputLogFile);
InheritOptionalValue(output.LabelSummary, parentOutput.LabelSummary);
InheritOptionalValue(output.SubprojectSummary,
......@@ -1340,7 +1339,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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment