dilim/CMake
1
0 Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-11-06 05:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ctest: Simplify command line argument handlers

Browse Source 
Replace the individual lambdas that only assign or append their value
to a field with small helpers.
This commit is contained in:
Tyler Yankee committed 2026-11-03 09:23:45 -05:00
1 parent 62f2e49c7e
commit 3e8ef24c63
1 file changed
+31 -45
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmCTest.cxx
+31 -45
View File
@@ -1996,18 +1996,6 @@ int cmCTest::Run(std::vector<std::string> const& args)
this->SetConfigType(config);
return true;
};
auto const dashGroup = [this](std::string const& group) -> bool {
this->Impl->SpecificGroup = group;
return true;
};
auto const dashQ = [this](std::string const&) -> bool {
this->Impl->Quiet = true;
return true;
};
auto const dashV = [this](std::string const&) -> bool {
this->Impl->Verbose = true;
return true;
};
auto const dashVV = [this](std::string const&) -> bool {
this->Impl->ExtraVerbose = true;
this->Impl->Verbose = true;
@@ -2027,42 +2015,40 @@ int cmCTest::Run(std::vector<std::string> const& args)
this->SetNotesFiles(notes);
return true;
};
auto const dashI = [this](std::string const& tests) -> bool {
this->Impl->TestOptions.TestsToRunInformation = tests;
return true;
// Helpers to build handlers for arguments that simply store their value.
auto const assign = [](std::string& field) {
return [&field](std::string const& value) -> bool {
field = value;
return true;
};
};
auto const dashU = [this](std::string const&) -> bool {
this->Impl->TestOptions.UseUnion = true;
return true;
auto const append = [](std::vector<std::string>& field) {
return [&field](std::string const& value) -> bool {
field.push_back(value);
return true;
};
};
auto const dashR = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.IncludeRegularExpression = expr;
return true;
};
auto const dashE = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.ExcludeRegularExpression = expr;
return true;
};
auto const dashL = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.LabelRegularExpression.push_back(expr);
return true;
};
auto const dashLE = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.ExcludeLabelRegularExpression.push_back(expr);
return true;
};
auto const dashFA = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.ExcludeFixtureRegularExpression = expr;
return true;
};
auto const dashFS = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.ExcludeFixtureSetupRegularExpression = expr;
return true;
};
auto const dashFC = [this](std::string const& expr) -> bool {
this->Impl->TestOptions.ExcludeFixtureCleanupRegularExpression = expr;
return true;
auto const setFlag = [](bool& field) {
return [&field](std::string const&) -> bool {
field = true;
return true;
};
};
cmCTestTestOptions& testOptions = this->Impl->TestOptions;
auto const dashGroup = assign(this->Impl->SpecificGroup);
auto const dashQ = setFlag(this->Impl->Quiet);
auto const dashV = setFlag(this->Impl->Verbose);
auto const dashI = assign(testOptions.TestsToRunInformation);
auto const dashU = setFlag(testOptions.UseUnion);
auto const dashR = assign(testOptions.IncludeRegularExpression);
auto const dashE = assign(testOptions.ExcludeRegularExpression);
auto const dashL = append(testOptions.LabelRegularExpression);
auto const dashLE = append(testOptions.ExcludeLabelRegularExpression);
auto const dashFA = assign(testOptions.ExcludeFixtureRegularExpression);
auto const dashFS = assign(testOptions.ExcludeFixtureSetupRegularExpression);
auto const dashFC =
assign(testOptions.ExcludeFixtureCleanupRegularExpression);
using CommandArgument =
cmCommandLineArgument<bool(std::string const& value)>;