Merge branch 'master' into energy-pstate

[simgrid.git] / tools / cmake / CTestConfig.cmake

diff --git a/tools/cmake/CTestConfig.cmake b/tools/cmake/CTestConfig.cmake
index 7771c983ef6a3d65f2305e955789b9feb1955b4a..42b8753cea4284654859aa76adb31633e8279882 100644 (file)
--- 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()