X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d47226d248c0c739619c1d9dfa5017dc1588170..76afb8ed1e4613f86e67fa53c264bb55e485d203:/teshsuite/s4u/CMakeLists.txt

diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt
index 464fb573f4..4cba12cfda 100644
--- a/teshsuite/s4u/CMakeLists.txt
+++ b/teshsuite/s4u/CMakeLists.txt
@@ -1,5 +1,5 @@
 foreach(x actor actor-autorestart
-        activity-lifecycle
+        activity-lifecycle activity-test-wait
         comm-pt2pt wait-any-for
         cloud-interrupt-migration cloud-sharing
         concurrent_rw storage_client_server listen_async pid )
@@ -11,11 +11,16 @@ foreach(x actor actor-autorestart
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 
+foreach(x sleep exec comm)
+  target_sources(activity-lifecycle PRIVATE activity-lifecycle/testing_${x}.cpp)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/testing_${x}.cpp)
+endforeach()
+
 ## Add the tests.
-## Some need to be run with all factories, some need not tesh to run
+## Some need to be run with all factories, some don't need tesh to run
 foreach(x actor actor-autorestart
-        activity-lifecycle wait-any-for
-	cloud-interrupt-migration concurrent_rw) # TODO: actor-autorestart is disabled for now
+        activity-lifecycle activity-test-wait wait-any-for
+        cloud-interrupt-migration concurrent_rw)
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
   ADD_TESH_FACTORIES(tesh-s4u-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x}/${x}.tesh)
 endforeach()
@@ -44,6 +49,6 @@ foreach(x ns3-simultaneous-send-rcv)
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
 endforeach()
 
-set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
+set(teshsuite_src ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/activity-lifecycle.hpp PARENT_SCOPE)
 set(tesh_files    ${tesh_files}     PARENT_SCOPE)
 set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/testing_platform.xml PARENT_SCOPE)