From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 15 Oct 2017 19:36:23 +0000 (+0200)
Subject: Merge branch 'actor-startkilltime' of https://github.com/Takishipp/simgrid into Takis... 
X-Git-Tag: v3.18~446^2
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724

Merge branch 'actor-startkilltime' of https://github.com/Takishipp/simgrid into Takishipp-actor-startkilltime
---

364eee0fc6ab77fddc5437ac273527bd27711724
diff --cc examples/s4u/CMakeLists.txt
index 542c4548a6,eade5ff501..4d14919b47
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -1,7 -1,7 +1,7 @@@
  foreach (example actions-comm actions-storage 
 -                 actor-create actor-daemon actor-kill actor-migration actor-suspend 
 +                 actor-create actor-daemon actor-execute actor-kill actor-migration actor-suspend 
                   app-masterworker app-pingpong app-token-ring
- 		 async-wait async-waitany async-waitall
+ 		 async-wait async-waitany async-waitall actor-startkilltime 
  		 plugin-hostload io mutex)
    add_executable       (s4u-${example}  ${example}/s4u-${example}.cpp)
    target_link_libraries(s4u-${example}  simgrid)
@@@ -35,7 -35,7 +35,8 @@@ set(tesh_files    ${tesh_files}   ${CMA
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-execute/s4u-actor-execute.tesh         PARENT_SCOPE)
++                                  ${CMAKE_CURRENT_SOURCE_DIR}/actor-execute/s4u-actor-execute.tesh       
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/actor-startkilltime/s4u-actor-startkilltime.tesh         PARENT_SCOPE)
  set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/s4u-actions-storage_d.xml
@@@ -53,9 -57,9 +58,9 @@@ set(txt_files     ${txt_files}    ${CMA
                                    ${CMAKE_CURRENT_SOURCE_DIR}/README.doc                                   PARENT_SCOPE)
  
  foreach(example actions-comm actions-storage 
 -                actor-create actor-daemon actor-kill actor-migration actor-suspend
 +                actor-create actor-daemon actor-execute actor-kill actor-migration actor-suspend
                  app-bittorrent app-masterworker app-pingpong app-token-ring 
- 		async-wait async-waitall async-waitany
+ 		async-wait async-waitall async-waitany actor-startkilltime
  		dht-chord plugin-hostload io mutex)
    ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example} s4u-${example}.tesh)
  endforeach()