From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Fri, 25 Apr 2014 14:04:55 +0000 (+0200)
Subject: Force valgrind to output in XML.
X-Git-Tag: v3_11~98^2~35
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/149f133d9c4c83bfed16c146ef28b86ae989439d

Force valgrind to output in XML.
This will break cdash use, but enable jenkins parsing and displaying of the reports. Hopefully.
---

diff --git a/buildtools/Cmake/Modules/FindValgrind.cmake b/buildtools/Cmake/Modules/FindValgrind.cmake
index 5bee952e31..8fb251427e 100644
--- a/buildtools/Cmake/Modules/FindValgrind.cmake
+++ b/buildtools/Cmake/Modules/FindValgrind.cmake
@@ -21,7 +21,7 @@ if(VALGRIND_EXE)
   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")
+    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 --xml=yes --xml-file=memcheck_test_%p.memcheck --child-silent-after-fork=yes")
     message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}")
   else()
     set(enable_memcheck false)
@@ -32,4 +32,4 @@ else()
   message(FATAL_ERROR "Command valgrind not found --> enable_memcheck autoset to false.")
 endif()
 
-mark_as_advanced(VALGRIND_EXE)
\ No newline at end of file
+mark_as_advanced(VALGRIND_EXE)