Increase valgrind num-callers from 12 (default) to 20.

[simgrid.git] / buildtools / Cmake / Modules / FindValgrind.cmake

diff --git a/buildtools/Cmake/Modules/FindValgrind.cmake b/buildtools/Cmake/Modules/FindValgrind.cmake
index 9d764f8..5bee952 100644 (file)
--- a/buildtools/Cmake/Modules/FindValgrind.cmake
+++ b/buildtools/Cmake/Modules/FindValgrind.cmake
@@ -1,35 +1,35 @@
-find_program(VALGRIND_EXE 
-       NAME valgrind
-    PATH_SUFFIXES bin/
-    PATHS
-    /opt
-    /opt/local
-    /opt/csw
-    /sw
-    /usr
-)
+find_program(VALGRIND_EXE
+  NAME valgrind
+  PATH_SUFFIXES bin/
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
 
 if(VALGRIND_EXE)
-message(STATUS "Found valgrind: ${VALGRIND_EXE}")
-SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
-SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
-endif(VALGRIND_EXE)
+  message(STATUS "Found valgrind: ${VALGRIND_EXE}")
+  SET(VALGRIND_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
+  SET(MEMORYCHECK_COMMAND "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/my_valgrind.pl")
+endif()
 
 if(VALGRIND_EXE)
-       exec_program("${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
-       string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
-       if(NEW_VALGRIND_VERSION)
-               message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
-               exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
-               set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
-               message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
-       else(NEW_VALGRIND_VERSION)
-               set(enable_memcheck false)
-               message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
-       endif(NEW_VALGRIND_VERSION)
-else(VALGRIND_EXE)
-       set(enable_memcheck false)
-       message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")
-endif(VALGRIND_EXE)
+  exec_program("${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
+  string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
+  if(NEW_VALGRIND_VERSION)
+    message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
+    exec_program("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT)
+    set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --trace-children-skip=/usr/bin/*,/bin/* --leak-check=full --show-reachable=yes --track-origins=no --read-var-info=no --num-callers=20 --suppressions=${CMAKE_HOME_DIRECTORY}/tools/simgrid.supp")
+    message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
+  else()
+    set(enable_memcheck false)
+    message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
+  endif()
+else()
+  set(enable_memcheck false)
+  message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")
+endif()
 
 mark_as_advanced(VALGRIND_EXE)
\ No newline at end of file