X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba5e8b528ff29715f5a9008137e117a9fbcc24b0..2aa123eb6e39b46ca1061ecf6b65f215033d00d3:/tools/cmake/CTestConfig.cmake

diff --git a/tools/cmake/CTestConfig.cmake b/tools/cmake/CTestConfig.cmake
index c816648109..42b8753cea 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,11 +38,6 @@ 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