this test is superseeded by activity-lifecycle

diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt
index e6c4246..28313f9 100644 (file)
--- a/teshsuite/s4u/CMakeLists.txt
+++ b/teshsuite/s4u/CMakeLists.txt
@@ -2,7 +2,7 @@ foreach(x actor actor-autorestart actor-migration
         activity-lifecycle
         comm-pt2pt
         cloud-interrupt-migration
-        concurrent_rw storage_client_server host_on_off_wait listen_async pid )
+        concurrent_rw storage_client_server listen_async pid )
   add_executable       (${x}  ${x}/${x}.cpp)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -23,7 +23,7 @@ endforeach()
 set(tesh_files    ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-autorestart/actor-autorestart.tesh)
 
 
-foreach(x host_on_off_wait listen_async pid storage_client_server)
+foreach(x listen_async pid storage_client_server)
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
   ADD_TESH(tesh-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()

diff --git a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp b/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp
deleted file mode 100644 (file)
index b0fcb13..0000000
--- a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#include "simgrid/s4u.hpp"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
-
-static void master()
-{
-  simgrid::s4u::Host* jupiter = simgrid::s4u::Host::by_name("Jupiter");
-  XBT_INFO("Master waiting");
-  simgrid::s4u::this_actor::sleep_for(1);
-
-  XBT_INFO("Turning off the worker host");
-  jupiter->turn_off();
-  XBT_INFO("Master has finished");
-}
-
-static void worker()
-{
-  XBT_INFO("Worker waiting");
-  try {
-    simgrid::s4u::this_actor::sleep_for(5);
-  } catch (simgrid::HostFailureException& e) {
-    XBT_INFO("The host has died ... as expected.");
-    return;
-  }
-  XBT_INFO("The host did not die! That's a bug!");
-}
-
-int main(int argc, char* argv[])
-{
-  simgrid::s4u::Engine e(&argc, argv);
-  e.load_platform(argv[1]);
-
-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), master);
-  simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Jupiter"), worker);
-
-  e.run();
-  XBT_INFO("Simulation time %g", e.get_clock());
-
-  return 0;
-}

diff --git a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh b/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh
deleted file mode 100644 (file)
index d82c303..0000000
--- a/teshsuite/s4u/host_on_off_wait/host_on_off_wait.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-$ ./host_on_off_wait ${platfdir}/small_platform.xml
-> [Tremblay:master:(1) 0.000000] [s4u_test/INFO] Master waiting
-> [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Worker waiting
-> [Tremblay:master:(1) 1.000000] [s4u_test/INFO] Turning off the worker host
-> [Tremblay:master:(1) 1.000000] [s4u_test/INFO] Master has finished
-> [Jupiter:worker:(2) 1.000000] [s4u_test/INFO] The host has died ... as expected.
-> [1.000000] [s4u_test/INFO] Simulation time 1