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
Better warning message for max-depth
[simgrid.git]
/
tools
/
cmake
/
CTestConfig.cmake
diff --git
a/tools/cmake/CTestConfig.cmake
b/tools/cmake/CTestConfig.cmake
index c8166481095a61224b0e309b1c0382070fc61e9d..5ef4600bd135bcb7b4d69ba918d248e34ffef111 100644
(file)
--- a/
tools/cmake/CTestConfig.cmake
+++ b/
tools/cmake/CTestConfig.cmake
@@
-5,18
+5,19
@@
if(APPLE)
SET(BUILDNAME "APPLE" CACHE INTERNAL "Buildname" FORCE)
else()
SET(BUILDNAME "UNIX" CACHE INTERNAL "Buildname" FORCE)
SET(BUILDNAME "APPLE" CACHE INTERNAL "Buildname" FORCE)
else()
SET(BUILDNAME "UNIX" CACHE INTERNAL "Buildname" FORCE)
- if(WIN32)
- SET(BUILDNAME "WINDOWS" CACHE INTERNAL "Buildname" FORCE)
- 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_STATEFUL
_MC)
SET(BUILDNAME "MODEL-CHECKING" CACHE INTERNAL "Buildname" FORCE)
endif()
SET(BUILDNAME "MODEL-CHECKING" CACHE INTERNAL "Buildname" FORCE)
endif()
@@
-34,26
+35,16
@@
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 "")
if(enable_coverage)
- set(PATTERN_CTEST_IGNORED
+ set(PATTERN_CTEST_IGNORED
"/tools/"
"/buildtools/"
"/include/"
"/teshsuite/"
"/src/bindings/"
"/tools/"
"/buildtools/"
"/include/"
"/teshsuite/"
"/src/bindings/"
+ "/examples/"
)
)
- if(NOT release)
- set(PATTERN_CTEST_IGNORED
- ${PATTERN_CTEST_IGNORED}
- "/examples/"
- )
- endif()
endif()
CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)
endif()
CONFIGURE_FILE(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)