diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-06-15 14:53:49 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-06-15 14:53:49 (GMT) |
| commit | d6f77bddc46d0eacc59671b769a7eefc5e374c31 (patch) | |
| tree | 53cf0f8467eea236a94c0eaa962f61a1fa60365f | |
| parent | 9755dd4f22bbcdeca8a44a0d8794c1bc4943ecfe (diff) | |
| download | CMake-d6f77bddc46d0eacc59671b769a7eefc5e374c31.zip CMake-d6f77bddc46d0eacc59671b769a7eefc5e374c31.tar.gz CMake-d6f77bddc46d0eacc59671b769a7eefc5e374c31.tar.bz2 | |
ENH: Pass in memcheck command options and suppresions, and change skin to tool
| -rw-r--r-- | Source/CTest/cmCTestMemCheckCommand.cxx | 7 | ||||
| -rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx index 0f05578..f8ca9a0 100644 --- a/Source/CTest/cmCTestMemCheckCommand.cxx +++ b/Source/CTest/cmCTestMemCheckCommand.cxx @@ -71,6 +71,13 @@ bool cmCTestMemCheckCommand::InitialPass( 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"); if ( !handler ) { diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 5c91129..a5646c0 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -324,7 +324,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() m_MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND; 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() ) { |