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
activate fortran attr tests
[simgrid.git]
/
teshsuite
/
simix
/
CMakeLists.txt
diff --git
a/teshsuite/simix/CMakeLists.txt
b/teshsuite/simix/CMakeLists.txt
index
980b9e2
..
ae82396
100644
(file)
--- a/
teshsuite/simix/CMakeLists.txt
+++ b/
teshsuite/simix/CMakeLists.txt
@@
-1,30
+1,35
@@
-foreach(x check
_defaults stack_
overflow)
- add_executable (${x} ${x}/${x}.c)
+foreach(x check
-defaults generic-simcalls stack-
overflow)
+ add_executable (${x} ${x}/${x}.c
pp
)
target_link_libraries(${x} simgrid)
set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
target_link_libraries(${x} simgrid)
set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
-
- set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+ set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
endforeach()
foreach (factory raw thread boost ucontext)
endforeach()
foreach (factory raw thread boost ucontext)
- set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/check
_
defaults/factory_${factory}.tesh)
+ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/check
-
defaults/factory_${factory}.tesh)
endforeach()
set(teshsuite_src ${teshsuite_src} PARENT_SCOPE)
endforeach()
set(teshsuite_src ${teshsuite_src} PARENT_SCOPE)
-set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow/stack_overflow.tesh PARENT_SCOPE)
+set(tesh_files ${tesh_files}
+ ${CMAKE_CURRENT_SOURCE_DIR}/stack-overflow/stack-overflow.tesh
+ ${CMAKE_CURRENT_SOURCE_DIR}/generic-simcalls/generic-simcalls.tesh
+ PARENT_SCOPE)
IF(HAVE_RAW_CONTEXTS)
IF(HAVE_RAW_CONTEXTS)
- ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_
defaults factory_raw.tesh)
+ ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-
defaults factory_raw.tesh)
ELSEIF(HAVE_UCONTEXT_CONTEXTS)
ELSEIF(HAVE_UCONTEXT_CONTEXTS)
- ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_
defaults factory_ucontext.tesh)
+ ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-
defaults factory_ucontext.tesh)
ELSEIF(HAVE_BOOST_CONTEXTS)
ELSEIF(HAVE_BOOST_CONTEXTS)
- ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_
defaults factory_boost.tesh)
+ ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-
defaults factory_boost.tesh)
ELSE()
ELSE()
- ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_
defaults factory_thread.tesh)
+ ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-
defaults factory_thread.tesh)
ENDIF()
ENDIF()
+if (NOT enable_memcheck AND NOT enable_address_sanitizer)
+ ADD_TESH_FACTORIES(stack-overflow "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack-overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack-overflow stack-overflow.tesh)
+endif()
if (NOT enable_memcheck)
if (NOT enable_memcheck)
-
ADD_TESH_FACTORIES(stack-overflow "thread;ucontext;boost;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack_overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow stack_overflow
.tesh)
+
ADD_TESH_FACTORIES(generic-simcalls "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/generic-simcalls --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/generic-simcalls generic-simcalls
.tesh)
endif()
foreach (factory raw thread boost ucontext)
endif()
foreach (factory raw thread boost ucontext)
@@
-33,6
+38,6
@@
foreach (factory raw thread boost ucontext)
if (release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true)
endif()
if (release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
SET_TESTS_PROPERTIES(stack-overflow-${factory} PROPERTIES WILL_FAIL true)
endif()
- ADD_TESH(tesh-simix-factory-${factory} --cfg contexts/factory:${factory} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_
defaults factory_${factory}.tesh)
+ ADD_TESH(tesh-simix-factory-${factory} --cfg contexts/factory:${factory} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check
-defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check-
defaults factory_${factory}.tesh)
endif()
endforeach()
endif()
endforeach()