mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 01:28:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmCTest*Command: Declare member functions const

Browse Source
This commit is contained in:
Daniel Pfeifer
2024-10-30 23:01:36 +01:00
parent 0e995d4897
commit c98ed10d0f
18 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestBuildCommand.cxx
+2 -2
View File
@@ -48,7 +48,7 @@ bool cmCTestBuildCommand::InitialPass(std::vector<std::string> const& args,
} }
std::unique_ptr<cmCTestGenericHandler> cmCTestBuildCommand::InitializeHandler( std::unique_ptr<cmCTestGenericHandler> cmCTestBuildCommand::InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) HandlerArguments& arguments, cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto const& args = static_cast<BuildArguments&>(arguments); auto const& args = static_cast<BuildArguments&>(arguments);
@@ -137,7 +137,7 @@ std::unique_ptr<cmCTestGenericHandler> cmCTestBuildCommand::InitializeHandler(
void cmCTestBuildCommand::ProcessAdditionalValues( void cmCTestBuildCommand::ProcessAdditionalValues(
cmCTestGenericHandler* generic, HandlerArguments const& arguments, cmCTestGenericHandler* generic, HandlerArguments const& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto const& args = static_cast<BuildArguments const&>(arguments); auto const& args = static_cast<BuildArguments const&>(arguments);
Source/CTest/cmCTestBuildCommand.h
+2 -2
View File
@@ -37,11 +37,11 @@ private:
std::string GetName() const override { return "ctest_build"; } std::string GetName() const override { return "ctest_build"; }
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
void ProcessAdditionalValues(cmCTestGenericHandler* handler, void ProcessAdditionalValues(cmCTestGenericHandler* handler,
HandlerArguments const& arguments, HandlerArguments const& arguments,
cmExecutionStatus& status) override; cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestConfigureCommand.cxx
+1 -1
View File
@@ -33,7 +33,7 @@ std::unique_ptr<cmCommand> cmCTestConfigureCommand::Clone()
std::unique_ptr<cmCTestGenericHandler> std::unique_ptr<cmCTestGenericHandler>
cmCTestConfigureCommand::InitializeHandler(HandlerArguments& arguments, cmCTestConfigureCommand::InitializeHandler(HandlerArguments& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto const& args = static_cast<ConfigureArguments&>(arguments); auto const& args = static_cast<ConfigureArguments&>(arguments);
Source/CTest/cmCTestConfigureCommand.h
+1 -1
View File
@@ -31,7 +31,7 @@ private:
std::string GetName() const override { return "ctest_configure"; } std::string GetName() const override { return "ctest_configure"; }
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestCoverageCommand.cxx
+1 -1
View File
@@ -26,7 +26,7 @@ std::unique_ptr<cmCommand> cmCTestCoverageCommand::Clone()
std::unique_ptr<cmCTestGenericHandler> std::unique_ptr<cmCTestGenericHandler>
cmCTestCoverageCommand::InitializeHandler(HandlerArguments& arguments, cmCTestCoverageCommand::InitializeHandler(HandlerArguments& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto& args = static_cast<CoverageArguments&>(arguments); auto& args = static_cast<CoverageArguments&>(arguments);
Source/CTest/cmCTestCoverageCommand.h
+1 -1
View File
@@ -34,7 +34,7 @@ private:
std::string GetName() const override { return "ctest_coverage"; } std::string GetName() const override { return "ctest_coverage"; }
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestHandlerCommand.cxx
+7 -6
View File
@@ -71,7 +71,7 @@ private:
bool cmCTestHandlerCommand::InvokeImpl( bool cmCTestHandlerCommand::InvokeImpl(
BasicArguments& args, std::vector<std::string> const& unparsed, BasicArguments& args, std::vector<std::string> const& unparsed,
cmExecutionStatus& status, std::function<bool()> handler) cmExecutionStatus& status, std::function<bool()> handler) const
{ {
// save error state and restore it if needed // save error state and restore it if needed
SaveRestoreErrorState errorState; SaveRestoreErrorState errorState;
@@ -116,8 +116,8 @@ bool cmCTestHandlerCommand::InvokeImpl(
return true; return true;
} }
bool cmCTestHandlerCommand::ExecuteHandlerCommand(HandlerArguments& args, bool cmCTestHandlerCommand::ExecuteHandlerCommand(
cmExecutionStatus& status) HandlerArguments& args, cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
@@ -200,18 +200,19 @@ bool cmCTestHandlerCommand::ExecuteHandlerCommand(HandlerArguments& args,
} }
void cmCTestHandlerCommand::CheckArguments(HandlerArguments&, void cmCTestHandlerCommand::CheckArguments(HandlerArguments&,
cmExecutionStatus&) cmExecutionStatus&) const
{ {
} }
std::unique_ptr<cmCTestGenericHandler> std::unique_ptr<cmCTestGenericHandler>
cmCTestHandlerCommand::InitializeHandler(HandlerArguments&, cmExecutionStatus&) cmCTestHandlerCommand::InitializeHandler(HandlerArguments&,
cmExecutionStatus&) const
{ {
return nullptr; return nullptr;
}; };
void cmCTestHandlerCommand::ProcessAdditionalValues(cmCTestGenericHandler*, void cmCTestHandlerCommand::ProcessAdditionalValues(cmCTestGenericHandler*,
HandlerArguments const&, HandlerArguments const&,
cmExecutionStatus&) cmExecutionStatus&) const
{ {
} }
Source/CTest/cmCTestHandlerCommand.h
+7 -6
View File
@@ -67,7 +67,7 @@ protected:
template <typename Args, typename Handler> template <typename Args, typename Handler>
bool Invoke(cmArgumentParser<Args> const& parser, bool Invoke(cmArgumentParser<Args> const& parser,
std::vector<std::string> const& arguments, std::vector<std::string> const& arguments,
cmExecutionStatus& status, Handler handler) cmExecutionStatus& status, Handler handler) const
{ {
std::vector<std::string> unparsed; std::vector<std::string> unparsed;
Args args = parser.Parse(arguments, &unparsed); Args args = parser.Parse(arguments, &unparsed);
@@ -76,22 +76,23 @@ protected:
}; };
bool ExecuteHandlerCommand(HandlerArguments& args, bool ExecuteHandlerCommand(HandlerArguments& args,
cmExecutionStatus& status); cmExecutionStatus& status) const;
private: private:
bool InvokeImpl(BasicArguments& args, bool InvokeImpl(BasicArguments& args,
std::vector<std::string> const& unparsed, std::vector<std::string> const& unparsed,
cmExecutionStatus& status, std::function<bool()> handler); cmExecutionStatus& status,
std::function<bool()> handler) const;
virtual std::string GetName() const = 0; virtual std::string GetName() const = 0;
virtual void CheckArguments(HandlerArguments& arguments, virtual void CheckArguments(HandlerArguments& arguments,
cmExecutionStatus& status); cmExecutionStatus& status) const;
virtual std::unique_ptr<cmCTestGenericHandler> InitializeHandler( virtual std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status); HandlerArguments& arguments, cmExecutionStatus& status) const;
virtual void ProcessAdditionalValues(cmCTestGenericHandler*, virtual void ProcessAdditionalValues(cmCTestGenericHandler*,
HandlerArguments const& arguments, HandlerArguments const& arguments,
cmExecutionStatus& status); cmExecutionStatus& status) const;
}; };
Source/CTest/cmCTestMemCheckCommand.cxx
+3 -3
View File
@@ -23,8 +23,8 @@ std::unique_ptr<cmCommand> cmCTestMemCheckCommand::Clone()
} }
std::unique_ptr<cmCTestTestHandler> std::unique_ptr<cmCTestTestHandler>
cmCTestMemCheckCommand::InitializeActualHandler(HandlerArguments& args, cmCTestMemCheckCommand::InitializeActualHandler(
cmExecutionStatus& status) HandlerArguments& args, cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto handler = cm::make_unique<cmCTestMemCheckHandler>(this->CTest); auto handler = cm::make_unique<cmCTestMemCheckHandler>(this->CTest);
@@ -49,7 +49,7 @@ cmCTestMemCheckCommand::InitializeActualHandler(HandlerArguments& args,
void cmCTestMemCheckCommand::ProcessAdditionalValues( void cmCTestMemCheckCommand::ProcessAdditionalValues(
cmCTestGenericHandler* handler, HandlerArguments const& arguments, cmCTestGenericHandler* handler, HandlerArguments const& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto const& args = static_cast<MemCheckArguments const&>(arguments); auto const& args = static_cast<MemCheckArguments const&>(arguments);
Source/CTest/cmCTestMemCheckCommand.h
+2 -2
View File
@@ -32,11 +32,11 @@ private:
std::string GetName() const override { return "ctest_memcheck"; } std::string GetName() const override { return "ctest_memcheck"; }
std::unique_ptr<cmCTestTestHandler> InitializeActualHandler( std::unique_ptr<cmCTestTestHandler> InitializeActualHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
void ProcessAdditionalValues(cmCTestGenericHandler* handler, void ProcessAdditionalValues(cmCTestGenericHandler* handler,
HandlerArguments const& arguments, HandlerArguments const& arguments,
cmExecutionStatus& status) override; cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestSubmitCommand.cxx
+3 -3
View File
@@ -31,7 +31,7 @@ std::unique_ptr<cmCommand> cmCTestSubmitCommand::Clone()
} }
std::unique_ptr<cmCTestGenericHandler> cmCTestSubmitCommand::InitializeHandler( std::unique_ptr<cmCTestGenericHandler> cmCTestSubmitCommand::InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) HandlerArguments& arguments, cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto const& args = static_cast<SubmitArguments&>(arguments); auto const& args = static_cast<SubmitArguments&>(arguments);
@@ -208,7 +208,7 @@ bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args,
} }
void cmCTestSubmitCommand::CheckArguments(HandlerArguments& arguments, void cmCTestSubmitCommand::CheckArguments(HandlerArguments& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto& args = static_cast<SubmitArguments&>(arguments); auto& args = static_cast<SubmitArguments&>(arguments);
@@ -241,7 +241,7 @@ void cmCTestSubmitCommand::CheckArguments(HandlerArguments& arguments,
void cmCTestSubmitCommand::ProcessAdditionalValues( void cmCTestSubmitCommand::ProcessAdditionalValues(
cmCTestGenericHandler*, HandlerArguments const& arguments, cmCTestGenericHandler*, HandlerArguments const& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto const& args = static_cast<SubmitArguments const&>(arguments); auto const& args = static_cast<SubmitArguments const&>(arguments);
Source/CTest/cmCTestSubmitCommand.h
+3 -3
View File
@@ -46,14 +46,14 @@ private:
std::string GetName() const override { return "ctest_submit"; } std::string GetName() const override { return "ctest_submit"; }
void CheckArguments(HandlerArguments& arguments, void CheckArguments(HandlerArguments& arguments,
cmExecutionStatus& status) override; cmExecutionStatus& status) const override;
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
void ProcessAdditionalValues(cmCTestGenericHandler* handler, void ProcessAdditionalValues(cmCTestGenericHandler* handler,
HandlerArguments const& arguments, HandlerArguments const& arguments,
cmExecutionStatus& status) override; cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestTestCommand.cxx
+2 -2
View File
@@ -29,7 +29,7 @@ std::unique_ptr<cmCommand> cmCTestTestCommand::Clone()
} }
std::unique_ptr<cmCTestGenericHandler> cmCTestTestCommand::InitializeHandler( std::unique_ptr<cmCTestGenericHandler> cmCTestTestCommand::InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) HandlerArguments& arguments, cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto& args = static_cast<TestArguments&>(arguments); auto& args = static_cast<TestArguments&>(arguments);
@@ -148,7 +148,7 @@ std::unique_ptr<cmCTestGenericHandler> cmCTestTestCommand::InitializeHandler(
std::unique_ptr<cmCTestTestHandler> std::unique_ptr<cmCTestTestHandler>
cmCTestTestCommand::InitializeActualHandler(HandlerArguments&, cmCTestTestCommand::InitializeActualHandler(HandlerArguments&,
cmExecutionStatus&) cmExecutionStatus&) const
{ {
return cm::make_unique<cmCTestTestHandler>(this->CTest); return cm::make_unique<cmCTestTestHandler>(this->CTest);
} }
Source/CTest/cmCTestTestCommand.h
+2 -2
View File
@@ -84,10 +84,10 @@ private:
std::string GetName() const override { return "ctest_test"; } std::string GetName() const override { return "ctest_test"; }
virtual std::unique_ptr<cmCTestTestHandler> InitializeActualHandler( virtual std::unique_ptr<cmCTestTestHandler> InitializeActualHandler(
HandlerArguments& arguments, cmExecutionStatus& status); HandlerArguments& arguments, cmExecutionStatus& status) const;
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestUpdateCommand.cxx
+1 -1
View File
@@ -22,7 +22,7 @@ std::unique_ptr<cmCommand> cmCTestUpdateCommand::Clone()
} }
std::unique_ptr<cmCTestGenericHandler> cmCTestUpdateCommand::InitializeHandler( std::unique_ptr<cmCTestGenericHandler> cmCTestUpdateCommand::InitializeHandler(
HandlerArguments& args, cmExecutionStatus& status) HandlerArguments& args, cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
if (!args.Source.empty()) { if (!args.Source.empty()) {
Source/CTest/cmCTestUpdateCommand.h
+1 -1
View File
@@ -25,7 +25,7 @@ private:
std::string GetName() const override { return "ctest_update"; } std::string GetName() const override { return "ctest_update"; }
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& args, cmExecutionStatus& status) override; HandlerArguments& args, cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;
Source/CTest/cmCTestUploadCommand.cxx
+2 -2
View File
@@ -27,7 +27,7 @@ std::unique_ptr<cmCommand> cmCTestUploadCommand::Clone()
} }
void cmCTestUploadCommand::CheckArguments(HandlerArguments& arguments, void cmCTestUploadCommand::CheckArguments(HandlerArguments& arguments,
cmExecutionStatus& status) cmExecutionStatus& status) const
{ {
cmMakefile& mf = status.GetMakefile(); cmMakefile& mf = status.GetMakefile();
auto& args = static_cast<UploadArguments&>(arguments); auto& args = static_cast<UploadArguments&>(arguments);
@@ -44,7 +44,7 @@ void cmCTestUploadCommand::CheckArguments(HandlerArguments& arguments,
} }
std::unique_ptr<cmCTestGenericHandler> cmCTestUploadCommand::InitializeHandler( std::unique_ptr<cmCTestGenericHandler> cmCTestUploadCommand::InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus&) HandlerArguments& arguments, cmExecutionStatus&) const
{ {
auto const& args = static_cast<UploadArguments&>(arguments); auto const& args = static_cast<UploadArguments&>(arguments);
auto handler = cm::make_unique<cmCTestUploadHandler>(this->CTest); auto handler = cm::make_unique<cmCTestUploadHandler>(this->CTest);
Source/CTest/cmCTestUploadCommand.h
+2 -2
View File
@@ -32,10 +32,10 @@ private:
std::string GetName() const override { return "ctest_upload"; } std::string GetName() const override { return "ctest_upload"; }
void CheckArguments(HandlerArguments& arguments, void CheckArguments(HandlerArguments& arguments,
cmExecutionStatus& status) override; cmExecutionStatus& status) const override;
std::unique_ptr<cmCTestGenericHandler> InitializeHandler( std::unique_ptr<cmCTestGenericHandler> InitializeHandler(
HandlerArguments& arguments, cmExecutionStatus& status) override; HandlerArguments& arguments, cmExecutionStatus& status) const override;
bool InitialPass(std::vector<std::string> const& args, bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override; cmExecutionStatus& status) override;