X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/983ca84f3ac2d74ba56145026d89bd11f3f096e5..1fc52b3b94e6c88b3321d6b44753c6ee7324d96a:/tools/cmake/CTestConfig.cmake

diff --git a/tools/cmake/CTestConfig.cmake b/tools/cmake/CTestConfig.cmake
index c816648109..0debf7c1ed 100644
--- a/tools/cmake/CTestConfig.cmake
+++ b/tools/cmake/CTestConfig.cmake
@@ -10,13 +10,17 @@ else()
   endif()
 endif()
 
-  set(DART_TESTING_TIMEOUT "300") #TIMEOUT FOR EACH TEST
+if(NOT enable_memcheck)
+  set(DART_TESTING_TIMEOUT "500") #TIMEOUT FOR EACH TEST
+else()
+  set(DART_TESTING_TIMEOUT "3000") #TIMEOUT FOR EACH TEST
+endif()
 
 if(enable_compile_warnings AND enable_compile_optimizations)
   SET(BUILDNAME "FULL_FLAGS" CACHE INTERNAL "Buildname" FORCE)
 endif()
 
-if(HAVE_MC)
+if(SIMGRID_HAVE_MC)
   SET(BUILDNAME "MODEL-CHECKING" CACHE INTERNAL "Buildname" FORCE)
 endif()
 
@@ -34,26 +38,16 @@ SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")
 SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
 SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
 
-set(PIPOL_IMAGE $ENV{PIPOL_IMAGE})
-if(NOT ${PIPOL_IMAGE} MATCHES "\n")
-  set(SITE ${PIPOL_IMAGE})
-endif()
-
 set(PATTERN_CTEST_IGNORED "")
 if(enable_coverage)
-    set(PATTERN_CTEST_IGNORED 
+    set(PATTERN_CTEST_IGNORED
       "/tools/"
       "/buildtools/"
       "/include/"
       "/teshsuite/"
       "/src/bindings/"
+      "/examples/"
     )
-    if(NOT release)
-       set(PATTERN_CTEST_IGNORED 
-        ${PATTERN_CTEST_IGNORED}
-        "/examples/"
-        )
-    endif()
 endif()
 
 CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)