Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / buildtools / Cmake / CTestConfig.cmake

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index d62d71c..bb6e9fa 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -10,18 +10,12 @@ else()
   endif()
 endif()
 
-if(enable_memcheck)
-  set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
-endif()
+  set(DART_TESTING_TIMEOUT "300") #TIMEOUT FOR EACH TEST
 
 if(enable_compile_warnings AND enable_compile_optimizations)
   SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
 endif()
 
-if(enable_supernovae)
-  SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
-endif()
-
 if(HAVE_GTNETS)
   SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
 endif()
@@ -55,11 +49,10 @@ if(enable_coverage)
       "/tools/"
       "/buildtools/"
       "/include/"
-      "/testsuite/"
       "/teshsuite/"
       "/src/bindings/"
     )
-    if(release)
+    if(NOT release)
        set(PATTERN_CTEST_IGNORED 
         ${PATTERN_CTEST_IGNORED}
         "/examples/"