[cmake] AddTest() removed wrappers memcheck|callgrind.

scripts/cmake/test/AddTest.cmake

@@ -10,7 +10,7 @@
 #   PATH <working directory> # relative to SourceDir/Tests/Data
 #   EXECUTABLE <executable target> # optional, defaults to ogs
 #   EXECUTABLE_ARGS <arguments>
-#   WRAPPER <time|memcheck|callgrind|mpirun> # optional
+#   WRAPPER <time|mpirun> # optional
 #   WRAPPER_ARGS <arguments> # optional
 #   TESTER <diff|vtkdiff|gmldiff|memcheck> # optional
 #   TESTER_ARGS <argument> # optional
@@ -164,32 +164,6 @@ function(AddTest)
             )
             set(AddTest_WRAPPER_ARGS "")
         endif()
-    elseif(AddTest_WRAPPER STREQUAL "memcheck")
-        if(VALGRIND_TOOL_PATH)
-            set(WRAPPER_COMMAND
-                "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${AddTest_SOURCE_PATH}/${AddTest_NAME}_memcheck.txt -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff"
-            )
-            set(tester memcheck)
-        else()
-            set(DISABLED_TESTS_LOG
-                "${DISABLED_TESTS_LOG}\nDisabling memcheck wrapper for ${AddTest_NAME} as memcheck exe was not found!"
-                CACHE INTERNAL ""
-            )
-            set(AddTest_WRAPPER_ARGS "")
-        endif()
-    elseif(AddTest_WRAPPER STREQUAL "callgrind")
-        if(VALGRIND_TOOL_PATH)
-            set(WRAPPER_COMMAND
-                "${VALGRIND_TOOL_PATH} --tool=callgrind --branch-sim=yes --cache-sim=yes --dump-instr=yes --collect-jumps=yes"
-            )
-            unset(tester)
-        else()
-            set(DISABLED_TESTS_LOG
-                "${DISABLED_TESTS_LOG}\nDisabling callgrind wrapper for ${AddTest_NAME} as callgrind exe was not found!"
-                CACHE INTERNAL ""
-            )
-            set(AddTest_WRAPPER_ARGS "")
-        endif()
     elseif(AddTest_WRAPPER STREQUAL "mpirun")
         if(MPIRUN_TOOL_PATH)
             if("${HOSTNAME}" MATCHES "frontend.*")

scripts/cmake/test/MeshTest.cmake

@@ -8,7 +8,7 @@
 #   PATH <working directory> # relative to SourceDir/Tests/Data
 #   EXECUTABLE <executable target> # optional, defaults to ogs
 #   EXECUTABLE_ARGS <arguments>
-#   WRAPPER <time|memcheck|callgrind|mpirun> # optional
+#   WRAPPER <time|mpirun> # optional
 #   WRAPPER_ARGS <arguments> # optional
 #   REQUIREMENTS # optional simple boolean expression which has to be true to
 #                  enable the test, e.g.
@@ -85,32 +85,6 @@ function(MeshTest)
             )
             set(MeshTest_WRAPPER_ARGS "")
         endif()
-    elseif(MeshTest_WRAPPER STREQUAL "memcheck")
-        if(VALGRIND_TOOL_PATH)
-            set(WRAPPER_COMMAND
-                "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${MeshTest_SOURCE_PATH}/${MeshTest_NAME}_memcheck.log -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff"
-            )
-            set(tester memcheck)
-        else()
-            set(DISABLED_TESTS_LOG
-                "${DISABLED_TESTS_LOG}\nDisabling memcheck wrapper for ${MeshTest_NAME} as memcheck exe was not found!"
-                CACHE INTERNAL ""
-            )
-            set(MeshTest_WRAPPER_ARGS "")
-        endif()
-    elseif(MeshTest_WRAPPER STREQUAL "callgrind")
-        if(VALGRIND_TOOL_PATH)
-            set(WRAPPER_COMMAND
-                "${VALGRIND_TOOL_PATH} --tool=callgrind --branch-sim=yes --cache-sim=yes --dump-instr=yes --collect-jumps=yes"
-            )
-            unset(tester)
-        else()
-            set(DISABLED_TESTS_LOG
-                "${DISABLED_TESTS_LOG}\nDisabling callgrind wrapper for ${MeshTest_NAME} as callgrind exe was not found!"
-                CACHE INTERNAL ""
-            )
-            set(MeshTest_WRAPPER_ARGS "")
-        endif()
     elseif(MeshTest_WRAPPER STREQUAL "mpirun")
         if(MPIRUN_TOOL_PATH)
             set(WRAPPER_COMMAND ${MPIRUN_TOOL_PATH})

scripts/cmake/test/Test.cmake

@@ -3,7 +3,6 @@ find_program(DIFF_TOOL_PATH diff)
 find_program(TIME_TOOL_PATH time)
 find_program(GREP_TOOL_PATH grep)
 find_program(BASH_TOOL_PATH bash)
-find_program(VALGRIND_TOOL_PATH valgrind)
 find_program(MPIRUN_TOOL_PATH mpirun)
 
 if(NOT TIME_TOOL_PATH)
@@ -12,18 +11,6 @@ if(NOT TIME_TOOL_PATH)
             "time-command is required for time wrapper but was not found! All corresponding tests are disabled."
     )
 endif()
-if(NOT VALGRIND_TOOL_PATH)
-    message(
-        STATUS
-            "Valgrind is required for memcheck wrapper but was not found! All corresponding tests are disabled."
-    )
-endif()
-if(NOT VALGRIND_TOOL_PATH)
-    message(
-        STATUS
-            "Valgrind is required for callgrind wrapper but was not found! All corresponding tests are disabled."
-    )
-endif()
 if(NOT MPIRUN_TOOL_PATH)
     message(
         STATUS