ValgrindSettings: Introduce leakCheckOnFinishOptionString()

Change-Id: I0ddfc583b84536cdcdb49971bd7755ebaf36962c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-10-01 14:31:05 +02:00
parent 0ec78b422a
commit 15d5f130f7
3 changed files with 13 additions and 14 deletions

View File

@@ -185,20 +185,7 @@ void MemcheckToolRunner::addToolArguments(CommandLine &cmd) const
if (m_settings.showReachable())
cmd << "--show-reachable=yes";
QString leakCheckValue;
switch (m_settings.leakCheckOnFinish()) {
case ValgrindSettings::LeakCheckOnFinishNo:
leakCheckValue = "no";
break;
case ValgrindSettings::LeakCheckOnFinishYes:
leakCheckValue = "full";
break;
case ValgrindSettings::LeakCheckOnFinishSummaryOnly:
default:
leakCheckValue = "summary";
break;
}
cmd << "--leak-check=" + leakCheckValue;
cmd << "--leak-check=" + m_settings.leakCheckOnFinishOptionString();
for (const FilePath &file : m_settings.suppressions())
cmd << QString("--suppressions=%1").arg(file.path());

View File

@@ -397,6 +397,17 @@ ValgrindSettings::ValgrindSettings(bool global)
readSettings();
}
QString ValgrindSettings::leakCheckOnFinishOptionString() const
{
switch (leakCheckOnFinish()) {
case ValgrindSettings::LeakCheckOnFinishNo: return "no";
case ValgrindSettings::LeakCheckOnFinishYes: return "full";
case ValgrindSettings::LeakCheckOnFinishSummaryOnly:
default: return "summary";
}
return {};
}
ValgrindSettings &globalSettings()
{
static ValgrindSettings theSettings{true};

View File

@@ -70,6 +70,7 @@ public:
Utils::StringAspect memcheckArguments{this};
Utils::IntegerAspect numCallers{this};
Utils::SelectionAspect leakCheckOnFinish{this};
QString leakCheckOnFinishOptionString() const;
Utils::BoolAspect showReachable{this};
Utils::BoolAspect trackOrigins{this};
Utils::BoolAspect filterExternalIssues{this};