
This changes `cmMakefile::AddDefinition` to take a `cm::string_view` as value argument instead of a `const char *`. Benefits are: - `std::string` can be passed to `cmMakefile::AddDefinition` directly without the `c_str()` plus string length recomputation fallback. - Lengths of literals passed to `cmMakefile::AddDefinition` can be computed at compile time. In various sources uses of `cmMakefile::AddDefinition` are adapted to avoid `std::string::c_str` calls and the `std::string` is passed directly. Uses of `cmMakefile::AddDefinition`, where a `nullptr` `const char*` might be passed to `cmMakefile::AddDefinition` are extended with `nullptr` checks.
52 lines
1.8 KiB
C++
52 lines
1.8 KiB
C++
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
file Copyright.txt or https://cmake.org/licensing for details. */
|
|
#include "cmCTestMemCheckCommand.h"
|
|
|
|
#include <sstream>
|
|
#include <vector>
|
|
|
|
#include "cmCTest.h"
|
|
#include "cmCTestMemCheckHandler.h"
|
|
#include "cmMakefile.h"
|
|
|
|
cmCTestMemCheckCommand::cmCTestMemCheckCommand()
|
|
{
|
|
this->Arguments[ctm_DEFECT_COUNT] = "DEFECT_COUNT";
|
|
this->Arguments[ctm_LAST] = nullptr;
|
|
this->Last = ctm_LAST;
|
|
}
|
|
|
|
cmCTestGenericHandler* cmCTestMemCheckCommand::InitializeActualHandler()
|
|
{
|
|
cmCTestMemCheckHandler* handler = this->CTest->GetMemCheckHandler();
|
|
handler->Initialize();
|
|
|
|
this->CTest->SetCTestConfigurationFromCMakeVariable(
|
|
this->Makefile, "MemoryCheckType", "CTEST_MEMORYCHECK_TYPE", this->Quiet);
|
|
this->CTest->SetCTestConfigurationFromCMakeVariable(
|
|
this->Makefile, "MemoryCheckSanitizerOptions",
|
|
"CTEST_MEMORYCHECK_SANITIZER_OPTIONS", this->Quiet);
|
|
this->CTest->SetCTestConfigurationFromCMakeVariable(
|
|
this->Makefile, "MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND",
|
|
this->Quiet);
|
|
this->CTest->SetCTestConfigurationFromCMakeVariable(
|
|
this->Makefile, "MemoryCheckCommandOptions",
|
|
"CTEST_MEMORYCHECK_COMMAND_OPTIONS", this->Quiet);
|
|
this->CTest->SetCTestConfigurationFromCMakeVariable(
|
|
this->Makefile, "MemoryCheckSuppressionFile",
|
|
"CTEST_MEMORYCHECK_SUPPRESSIONS_FILE", this->Quiet);
|
|
|
|
handler->SetQuiet(this->Quiet);
|
|
return handler;
|
|
}
|
|
|
|
void cmCTestMemCheckCommand::ProcessAdditionalValues(
|
|
cmCTestGenericHandler* handler)
|
|
{
|
|
if (this->Values[ctm_DEFECT_COUNT] && *this->Values[ctm_DEFECT_COUNT]) {
|
|
std::ostringstream str;
|
|
str << static_cast<cmCTestMemCheckHandler*>(handler)->GetDefectCount();
|
|
this->Makefile->AddDefinition(this->Values[ctm_DEFECT_COUNT], str.str());
|
|
}
|
|
}
|