remove the link before creating it

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

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 062f187..4371126 100644 (file)
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -2,7 +2,9 @@
 # http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
 
 SET(BUILDNAME "none" CACHE TYPE INTERNAL FORCE)
-
+if(enable_memcheck)
+       set(CTEST_TIMEOUT "300") #TIMEOUT FOR EACH TEST
+endif(enable_memcheck)
 if(with_context MATCHES ucontext AND NOT supernovae)
        SET(BUILDNAME "UCONTEXT" CACHE TYPE INTERNAL FORCE)
 endif(with_context MATCHES ucontext AND NOT supernovae)
@@ -15,9 +17,9 @@ if(enable_compile_warnings AND enable_compile_optimizations)
        SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
 endif(enable_compile_warnings AND enable_compile_optimizations)
 
-if(supernovae)
+if(enable_supernovae)
        SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
-endif(supernovae)
+endif(enable_supernovae)
 
 if(HAVE_GTNETS)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
@@ -49,8 +51,7 @@ SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")
 SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
 SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
 
-exec_program("echo $PIPOL_IMAGE" OUTPUT_VARIABLE PIPOL_IMAGE)
-#message("PIPOL_IMAGE : \"${PIPOL_IMAGE}\"")
+set(PIPOL_IMAGE $ENV{PIPOL_IMAGE})
 if(NOT ${PIPOL_IMAGE} MATCHES "\n")
 set(SITE ${PIPOL_IMAGE})
 endif(NOT ${PIPOL_IMAGE} MATCHES "\n")