From: Martin Quinson Date: Thu, 15 Jun 2017 00:41:07 +0000 (+0200) Subject: Now this test may pass X-Git-Tag: v3.16~93 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/de0cd0ad69890d63441635383794357e67144dd6 Now this test may pass --- diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt index cb1906439a..27538f6e24 100644 --- a/teshsuite/s4u/CMakeLists.txt +++ b/teshsuite/s4u/CMakeLists.txt @@ -19,8 +19,8 @@ foreach(x host_on_off_wait listen_async pid storage_client_server) endforeach() # The output is not relevant -ADD_TEST(tesh-s4u-comm-pt2pt ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-pt2pt/comm-pt2pt ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml) -ADD_TEST(tesh-s4u-comm-waitany ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-waitany/comm-waitany ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml) +ADD_TEST(tesh-s4u-comm-pt2pt ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-pt2pt/comm-pt2pt ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml) +ADD_TEST(tesh-s4u-comm-waitany ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-waitany/comm-waitany ${CMAKE_HOME_DIRECTORY}/examples/platforms/two_hosts.xml) diff --git a/teshsuite/s4u/comm-waitany/comm-waitany.cpp b/teshsuite/s4u/comm-waitany/comm-waitany.cpp index 407c7e8d66..6e3a2af9f8 100644 --- a/teshsuite/s4u/comm-waitany/comm-waitany.cpp +++ b/teshsuite/s4u/comm-waitany/comm-waitany.cpp @@ -22,8 +22,8 @@ static void receiver() } for (int i = 0; i < NUM_COMMS; i++) { - XBT_INFO("Sleeping for 100 seconds (for the %dth time)...", i + 1); - simgrid::s4u::this_actor::sleep_for(100.0); + XBT_INFO("Sleeping for 3 seconds (for the %dth time)...", i + 1); + simgrid::s4u::this_actor::sleep_for(3.0); XBT_INFO("Calling wait_any() for %ld pending comms", pending_comms.size()); std::vector::iterator ret_it = simgrid::s4u::Comm::wait_any(pending_comms.begin(), pending_comms.end());