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

ENH: Pass in memcheck command options and suppresions, and change skin to tool

Browse Source
This commit is contained in:
Andy Cedilnik 2005-06-15 10:53:49 -04:00
parent 9755dd4f22
commit d6f77bddc4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/CTest/cmCTestMemCheckCommand.cxx
View File

@ -71,6 +71,13 @@ bool cmCTestMemCheckCommand::InitialPass(
m_CTest->SetCTestConfiguration("BuildDirectory", build_dir); m_CTest->SetCTestConfiguration("BuildDirectory", build_dir);
} }
m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
"MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND");
m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
"MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS");
m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
"MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE");
cmCTestGenericHandler* handler = m_CTest->GetHandler("memcheck"); cmCTestGenericHandler* handler = m_CTest->GetHandler("memcheck");
if ( !handler ) if ( !handler )
{ {

2
Source/CTest/cmCTestMemCheckHandler.cxx
View File

@ -324,7 +324,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
m_MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND; m_MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND;
if ( !m_MemoryTesterOptions.size() ) if ( !m_MemoryTesterOptions.size() )
{ {
m_MemoryTesterOptions = "-q --skin=memcheck --leak-check=yes --show-reachable=yes --workaround-gcc296-bugs=yes --num-callers=100"; m_MemoryTesterOptions = "-q --tool=memcheck --leak-check=yes --show-reachable=yes --workaround-gcc296-bugs=yes --num-callers=100";
} }
if ( m_CTest->GetCTestConfiguration("MemoryCheckSuppressionFile").size() ) if ( m_CTest->GetCTestConfiguration("MemoryCheckSuppressionFile").size() )
{ {