A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ugly dict closer to the C APIs
[simgrid.git]
/
tools
/
cmake
/
CTestConfig.cmake
diff --git
a/tools/cmake/CTestConfig.cmake
b/tools/cmake/CTestConfig.cmake
index
c816648
..
42b8753
100644
(file)
--- a/
tools/cmake/CTestConfig.cmake
+++ b/
tools/cmake/CTestConfig.cmake
@@
-10,13
+10,17
@@
else()
endif()
endif()
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(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()
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(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 "")
if(enable_coverage)
set(PATTERN_CTEST_IGNORED