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
Use new/delete.
[simgrid.git]
/
teshsuite
/
simix
/
CMakeLists.txt
diff --git
a/teshsuite/simix/CMakeLists.txt
b/teshsuite/simix/CMakeLists.txt
index
980b9e2
..
6053625
100644
(file)
--- a/
teshsuite/simix/CMakeLists.txt
+++ b/
teshsuite/simix/CMakeLists.txt
@@
-1,9
+1,8
@@
-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)
@@
-11,7
+10,10
@@
foreach (factory raw thread boost ucontext)
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)
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)
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)
@@
-23,8
+25,11
@@
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)
ENDIF()
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()
+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)