From: Martin Quinson <624847+mquinson@users.noreply.github.com>
Date: Thu, 13 Sep 2018 20:00:17 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Tag: v3_21~92^2^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e94c2a7fc81a82998524aa55db075be69990d4ea?hp=-c

Merge branch 'master' into master
---

e94c2a7fc81a82998524aa55db075be69990d4ea
diff --combined examples/s4u/CMakeLists.txt
index 2185d6aaab,84723e986c..6e0b997782
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -3,7 -3,7 +3,7 @@@
  foreach (example actor-create actor-daemon actor-join actor-kill
                   actor-lifetime actor-migration actor-suspend actor-yield
                   app-chainsend app-pingpong app-token-ring
-                  async-wait async-waitany async-waitall async-ready
 -                 async-wait async-waitany async-waitall async-waituntil
++                 async-ready async-wait async-waitany async-waitall async-waituntil
                   cloud-capping cloud-migration cloud-simple
                   energy-exec energy-boot energy-link energy-vm
                   engine-filtering
@@@ -73,15 -73,16 +73,18 @@@ set(xml_files     ${xml_files}    ${CMA
                                    ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworkers/s4u-app-masterworkers_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall_d.xml
 +                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait_d.xml
 +                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-ready/s4u-ready-wait_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/async-waituntil/s4u-async-waituntil_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/s4u-dht-kademlia_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/energy-boot/platform_boot.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/io-file-remote/s4u-io-file-remote_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/platform-properties/s4u-platform-properties_d.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform-failures/s4u-masterworker-failures_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm-split_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm_d.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/replay-storage/s4u-replay-storage_d.xml
@@@ -96,13 -97,13 +99,13 @@@ set(txt_files     ${txt_files}    ${CMA
  foreach(example actor-create actor-daemon actor-join actor-kill
                  actor-lifetime actor-migration actor-suspend actor-yield
                  app-bittorrent app-chainsend app-masterworkers app-pingpong app-token-ring 
-                 async-wait async-waitall async-waitany async-ready
 -                async-wait async-waitall async-waitany async-waituntil
++                async-ready async-wait async-waitall async-waitany async-waituntil
                  cloud-capping cloud-migration cloud-simple
                  dht-chord dht-kademlia
                  energy-exec energy-boot energy-link energy-vm
                  engine-filtering
                  exec-async exec-basic exec-dvfs exec-monitor exec-ptask exec-remote
-                 platform-failures platform-properties plugin-hostload mutex
+                 platform-properties plugin-hostload mutex # FIXME: platform-failures is disabled
                  io-async io-file-system io-file-remote io-storage-raw
                  replay-comm replay-storage
                  routing-get-clusters