From 368914fb8daebc6d2d2cd58ab4645974b14216c2 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 1 Apr 2019 15:26:43 +0200 Subject: [PATCH] Revalidate tests, now that detached sends are not cancelled anymore. --- .../msg/host_on_off_processes/host_on_off_processes.tesh | 6 +++--- teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh b/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh index ef60921ccb..309dbd4a8f 100644 --- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh +++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh @@ -27,9 +27,9 @@ $ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 4 --log=no_loc > [Tremblay:test_launcher:(1) 20.000000] [msg_test/INFO] Turn Jupiter off > [Tremblay:test_launcher:(1) 20.000000] [msg_test/INFO] Test 4 is ok. (number of Process : 2, it should be 1 or 2 if RX has not been satisfied). An exception is raised when we turn off a node that has a process sleeping > [Tremblay:test_launcher:(1) 20.000000] [msg_test/INFO] Test done. See you! -> [Tremblay:commRX:(2) 20.000000] [msg_test/INFO] Receive message: TRANSFER_FAILURE -> [Tremblay:commRX:(2) 20.000000] [msg_test/INFO] RX Done -> [20.000000] [msg_test/INFO] Simulation time 20 +> [Tremblay:commRX:(2) 25.033047] [msg_test/INFO] Receive message: COMM +> [Tremblay:commRX:(2) 25.033047] [msg_test/INFO] RX Done +> [25.033047] [msg_test/INFO] Simulation time 25.033 $ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 5 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 5 (turn off dest during a communication : Create a Process/task to make a communication between Tremblay and Jupiter and turn off Jupiter during the communication diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp index 4130ad9534..be1e495d52 100644 --- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp +++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp @@ -291,7 +291,7 @@ static void test_comm_dsend_and_quit_get_before_put() bool recv_done = false; simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() { - //assert_exit(false, 2); + assert_exit(false, 2); char* payload = xbt_strdup("toto"); simgrid::s4u::this_actor::sleep_for(2); simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach(); @@ -300,7 +300,7 @@ static void test_comm_dsend_and_quit_get_before_put() }); simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() { - //assert_exit(false, 3); + assert_exit(false, 3); void* payload = simgrid::s4u::Mailbox::by_name("mb")->get(); xbt_free(payload); recv_done = true; @@ -421,7 +421,7 @@ static void main_dispatcher() run_test("comm", test_comm); run_test("comm dsend and quit (put before get)", test_comm_dsend_and_quit_put_before_get); - // run_test("comm dsend and quit (get before put)", test_comm_dsend_and_quit_get_before_put); FAILING + run_test("comm dsend and quit (get before put)", test_comm_dsend_and_quit_get_before_put); run_test("comm kill sender", test_comm_killsend); //run_test("comm recv and kill", test_host_off_while_receive); -- 2.20.1