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 04854c2..bb6e9fa 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -10,9 +10,7 @@ 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)