From 249fb4eaba258513892e38d29f92a141ba818945 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 17 Jul 2018 23:18:13 +0200
Subject: [PATCH] cmake: stop patching tesh in FindValgrind, that's too ugly

---
 tools/cmake/Modules/FindValgrind.cmake | 20 --------------------
 tools/cmake/Tests.cmake                | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/tools/cmake/Modules/FindValgrind.cmake b/tools/cmake/Modules/FindValgrind.cmake
index 4afd05bf88..e2e0ba6f53 100644
--- a/tools/cmake/Modules/FindValgrind.cmake
+++ b/tools/cmake/Modules/FindValgrind.cmake
@@ -9,23 +9,3 @@ find_program(VALGRIND_EXE
   /usr
   )
 mark_as_advanced(VALGRIND_EXE)
-
-if(enable_memcheck)
-  if (NOT VALGRIND_EXE MATCHES "NOTFOUND")
-    execute_process(COMMAND ${VALGRIND_EXE} --version  OUTPUT_VARIABLE "VALGRIND_VERSION")
-    message(STATUS "Valgrind version: ${VALGRIND_VERSION}")
-
-    set(TESH_WRAPPER ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/my_valgrind.pl)
-    set(TESH_WRAPPER ${TESH_WRAPPER}\ --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\ )
-    if(enable_memcheck_xml)
-      SET(TESH_WRAPPER ${TESH_WRAPPER}\ --xml=yes\ --xml-file=memcheck_test_%p.memcheck\ --child-silent-after-fork=yes\ )
-    endif()
-
-#    message(STATUS "tesh wrapper: ${TESH_WRAPPER}")
-
-    mark_as_advanced(TESH_WRAPPER)
-  else()
-    set(enable_memcheck false)
-    message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
-  endif()
-endif()
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index d0968fff0c..159fc167a3 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -11,6 +11,24 @@ SET(TESH_COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_BINARY_DIR}/bin/tesh)
 
 IF(enable_memcheck)
   INCLUDE(FindValgrind)
+
+  if (NOT VALGRIND_EXE MATCHES "NOTFOUND")
+    execute_process(COMMAND ${VALGRIND_EXE} --version  OUTPUT_VARIABLE "VALGRIND_VERSION")
+    message(STATUS "Valgrind version: ${VALGRIND_VERSION}")
+
+    set(TESH_WRAPPER ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/my_valgrind.pl)
+    set(TESH_WRAPPER ${TESH_WRAPPER}\ --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\ )
+    if(enable_memcheck_xml)
+      SET(TESH_WRAPPER ${TESH_WRAPPER}\ --xml=yes\ --xml-file=memcheck_test_%p.memcheck\ --child-silent-after-fork=yes\ )
+    endif()
+
+#    message(STATUS "tesh wrapper: ${TESH_WRAPPER}")
+
+    mark_as_advanced(TESH_WRAPPER)
+  else()
+    set(enable_memcheck false)
+    message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
+  endif()
 ENDIF()
 
 #some tests may take forever on non futexes systems, using busy_wait with n cores < n workers
-- 
2.20.1