BUG: fix for bug #8153 add purify suppression file and fix output to not be one big line
This commit is contained in:
parent
ca68d116e0
commit
bd1e91a460
@ -494,6 +494,22 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
|
|||||||
cmSystemTools::EscapeSpaces(this->MemoryTesterOutputFile.c_str());
|
cmSystemTools::EscapeSpaces(this->MemoryTesterOutputFile.c_str());
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
if( this->CTest->GetCTestConfiguration(
|
||||||
|
"MemoryCheckSuppressionFile").size() )
|
||||||
|
{
|
||||||
|
if( !cmSystemTools::FileExists(this->CTest->GetCTestConfiguration(
|
||||||
|
"MemoryCheckSuppressionFile").c_str()) )
|
||||||
|
{
|
||||||
|
cmCTestLog(this->CTest, ERROR_MESSAGE,
|
||||||
|
"Cannot find memory checker suppression file: "
|
||||||
|
<< this->CTest->GetCTestConfiguration(
|
||||||
|
"MemoryCheckSuppressionFile").c_str() << std::endl);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
this->MemoryTesterOptions += " /FilterFiles=" +
|
||||||
|
cmSystemTools::EscapeSpaces(this->CTest->GetCTestConfiguration(
|
||||||
|
"MemoryCheckSuppressionFile").c_str());
|
||||||
|
}
|
||||||
this->MemoryTesterOptions += " /SAVETEXTDATA=" + outputFile;
|
this->MemoryTesterOptions += " /SAVETEXTDATA=" + outputFile;
|
||||||
#else
|
#else
|
||||||
this->MemoryTesterOptions += " -log-file=" + outputFile;
|
this->MemoryTesterOptions += " -log-file=" + outputFile;
|
||||||
@ -941,5 +957,6 @@ cmCTestMemCheckHandler::PostProcessPurifyTest(cmCTestTestResult& res)
|
|||||||
while ( cmSystemTools::GetLineFromStream(ifs, line) )
|
while ( cmSystemTools::GetLineFromStream(ifs, line) )
|
||||||
{
|
{
|
||||||
res.Output += line;
|
res.Output += line;
|
||||||
|
res.Output += "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user