kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-valgrind-in-path'

Browse Source 
58cc3c22 Fix ctest to allow valgrind to show up in the path name of a memcheck tool.
This commit is contained in:
Brad King 2014-06-16 08:54:50 -04:00 committed by CMake Topic Stage
commit 6b05e03de4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CTest/cmCTestMemCheckHandler.cxx
View File

@ -423,17 +423,18 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
{ {
this->MemoryTester this->MemoryTester
= this->CTest->GetCTestConfiguration("MemoryCheckCommand").c_str(); = this->CTest->GetCTestConfiguration("MemoryCheckCommand").c_str();
std::string testerName =
cmSystemTools::GetFilenameName(this->MemoryTester);
// determine the checker type // determine the checker type
if ( this->MemoryTester.find("valgrind") != std::string::npos ) if ( testerName.find("valgrind") != std::string::npos )
{ {
this->MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND; this->MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND;
} }
else if ( this->MemoryTester.find("purify") != std::string::npos ) else if ( testerName.find("purify") != std::string::npos )
{ {
this->MemoryTesterStyle = cmCTestMemCheckHandler::PURIFY; this->MemoryTesterStyle = cmCTestMemCheckHandler::PURIFY;
} }
else if ( this->MemoryTester.find("BC") != std::string::npos ) else if ( testerName.find("BC") != std::string::npos )
{ {
this->MemoryTesterStyle = cmCTestMemCheckHandler::BOUNDS_CHECKER; this->MemoryTesterStyle = cmCTestMemCheckHandler::BOUNDS_CHECKER;
} }