Disable make test if memcheck, now make memcheck tests.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7794 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 70c5336..957ab16 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -6,18 +6,19 @@ if(enable_smpi)
 endif(enable_smpi)
 
 if(enable_memcheck)
+       include(FindPerl)
        exec_program("valgrind --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
-       if(VALGRIND_VERSION)
+       if(VALGRIND_VERSION AND PERL_EXECUTABLE)
                string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
                if(NEW_VALGRIND_VERSION)
                else(NEW_VALGRIND_VERSION)
                        set(enable_memcheck false)
                        message("Command valgrind not found --> enable_memcheck autoset to false.")
                endif(NEW_VALGRIND_VERSION)
-       else(VALGRIND_VERSION)
+       else(VALGRIND_VERSION AND PERL_EXECUTABLE)
                set(enable_memcheck false)
-               message("Command valgrind not found --> enable_memcheck autoset to false.")
-       endif(VALGRIND_VERSION)
+               message("Command valgrind or perl not found --> enable_memcheck autoset to false.")
+       endif(VALGRIND_VERSION AND PERL_EXECUTABLE)
 endif(enable_memcheck)
 
 ### For code coverage
@@ -29,10 +30,7 @@ SET(DROP_LOCATION "/submit.php?project=${PROJECT_NAME}")
 SET(DROP_SITE_CDASH TRUE)
 SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi")
 SET(COVERAGE_COMMAND "${GCOV_PATH}/gcov")
-#SET(VALGRIND_COMMAND "${VALGRIND_PATH}/valgrind")
-#SET(MEMORYCHECK_COMMAND "${VALGRIND_PATH}/valgrind")
-#set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
-set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no --valgrind ${VALGRIND_PATH}")
+set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full --show-reachable=yes --track-origins=yes --read-var-info=no")
 SET(VALGRIND_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
 SET(MEMORYCHECK_COMMAND "${PROJECT_DIRECTORY}/buildtools/Cmake/my_valgrind.pl")
 #If you use the --read-var-info option Memcheck will run more slowly but may give a more detailed description of any illegal address.

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 3b2e74a..e176892 100755 (executable)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -238,10 +238,15 @@ add_dependencies(distcheck dist-dir)
 ### Fill in the "make check" target ###
 #######################################
 
-add_custom_target(check
-COMMAND make test
-#WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
+if(enable_memcheck)
+       add_custom_target(check
+       COMMAND ctest -D ExperimentalMemCheck
+       )
+else(enable_memcheck)
+       add_custom_target(check
+       COMMAND make test
+       )
+endif(enable_memcheck)
 
 #######################################
 ### Fill in the "make all-clean" target ###

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index f875b23..1b6aa93 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -95,6 +95,9 @@ if(enable_print_message)
        if(enable_memcheck)
        message("")
        message("VALGRIND :                     ${NEW_VALGRIND_VERSION}")
+       message("VALGRIND :                     ${VALGRIND_COMMAND}")
+       message("OPTIONS  :                     ${MEMORYCHECK_COMMAND_OPTIONS}")
+       message("PERL     :                     ${PERL_EXECUTABLE}")
        endif(enable_memcheck)
        message("________________________________________________________________________________")
        message("________________________________________________________________________________ DEBUG END")

diff --git a/buildtools/Cmake/my_valgrind.pl b/buildtools/Cmake/my_valgrind.pl
index b019aee..4fc3050 100755 (executable)
--- a/buildtools/Cmake/my_valgrind.pl
+++ b/buildtools/Cmake/my_valgrind.pl
@@ -11,11 +11,6 @@ while($count!=$#ARGV+1)
                chdir ($ARGV[$count+1]);
                $count++;
        }
-       elsif($ARGV[$count] eq "--valgrind") {
-               print "valgrind_path $ARGV[$count+1]\n";
-               $val_path = $ARGV[$count+1];
-               $count++;
-       }
        else{
                $arg="$arg $ARGV[$count]";
        }