From: Arnaud Giersch Date: Thu, 6 Mar 2014 11:56:54 +0000 (+0100) Subject: Fix file names: they were exchanged. X-Git-Tag: v3_11~242^2~18 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/033e9aa84ae75d82be6dbb47c454619cd4321d2a?ds=sidebyside Fix file names: they were exchanged. --- diff --git a/teshsuite/msg/host_on_off.tesh b/teshsuite/msg/host_on_off.tesh index 4d62c23c1c..403d26d7de 100644 --- a/teshsuite/msg/host_on_off.tesh +++ b/teshsuite/msg/host_on_off.tesh @@ -1,19 +1,12 @@ -$ msg/task_destroy_cancel ${srcdir:=.}/msg/task_destroy_cancel.xml -> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal" -> [Jupiter:slave:(2) 0.027003] [msg_test/INFO] Handleling Task "normal" -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Canceling task "cancel directly" directly -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Destroying task "destroy directly" directly -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Canceling task "cancel" during comm -> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Destroying task "finalize" during comm -> [Jupiter:slave:(2) 0.682345] [msg_test/INFO] Task "normal" done in 0.655342 (amount 0.000000) -> [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Handleling Task "cancel" -> [Jupiter:worker1:(3) 0.709348] [msg_test/INFO] Start cancel -> [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Canceling task "cancel" -> [Jupiter:slave:(2) 0.709348] /home/bedaride/Boulot/simgrid/src/msg/msg_mailbox.c:129: [msg_mailbox/WARNING] Asked to write the received task in a non empty struct -- proceeding. -> [Jupiter:worker1:(3) 0.710127] [msg_test/INFO] Task done -> [Tremblay:master:(1) 0.736350] [msg_test/INFO] Goodbye now! -> [Jupiter:slave:(2) 0.736350] [msg_test/INFO] Handleling Task "finalize" -> [Jupiter:slave:(2) 0.736350] [msg_test/INFO] Destroying task "finalize" -> [Jupiter:slave:(2) 0.736350] [msg_test/INFO] I'm done. See you! -> [0.736350] [msg_test/INFO] Simulation time 0.73635 +$ msg/host_on_off ${srcdir:=.}/msg/host_on_off.xml +> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "task on" +> [Jupiter:slave:(2) 0.682345] [msg_test/INFO] Task "task on" done +> [Tremblay:master:(1) 1.027003] [msg_test/INFO] Sending "task off" +> [Tremblay:master:(1) 2.027003] [msg_test/INFO] Sending "task on without proc" +> [Tremblay:master:(1) 3.027003] [msg_test/INFO] Sending "task on with proc" +> [Tremblay:master:(1) 3.054005] [msg_test/INFO] Sending "finalize" +> [Jupiter:slave:(3) 3.709348] [msg_test/INFO] Task "task on with proc" done +> [Tremblay:master:(1) 3.710127] [msg_test/INFO] Goodbye now! +> [Jupiter:slave:(3) 3.710127] [msg_test/INFO] I'm done. See you! +> [3.710127] [msg_test/INFO] Simulation time 3.71013 diff --git a/teshsuite/msg/task_destroy_cancel.tesh b/teshsuite/msg/task_destroy_cancel.tesh index 403d26d7de..4d62c23c1c 100644 --- a/teshsuite/msg/task_destroy_cancel.tesh +++ b/teshsuite/msg/task_destroy_cancel.tesh @@ -1,12 +1,19 @@ -$ msg/host_on_off ${srcdir:=.}/msg/host_on_off.xml -> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "task on" -> [Jupiter:slave:(2) 0.682345] [msg_test/INFO] Task "task on" done -> [Tremblay:master:(1) 1.027003] [msg_test/INFO] Sending "task off" -> [Tremblay:master:(1) 2.027003] [msg_test/INFO] Sending "task on without proc" -> [Tremblay:master:(1) 3.027003] [msg_test/INFO] Sending "task on with proc" -> [Tremblay:master:(1) 3.054005] [msg_test/INFO] Sending "finalize" -> [Jupiter:slave:(3) 3.709348] [msg_test/INFO] Task "task on with proc" done -> [Tremblay:master:(1) 3.710127] [msg_test/INFO] Goodbye now! -> [Jupiter:slave:(3) 3.710127] [msg_test/INFO] I'm done. See you! -> [3.710127] [msg_test/INFO] Simulation time 3.71013 +$ msg/task_destroy_cancel ${srcdir:=.}/msg/task_destroy_cancel.xml +> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal" +> [Jupiter:slave:(2) 0.027003] [msg_test/INFO] Handleling Task "normal" +> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Canceling task "cancel directly" directly +> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Destroying task "destroy directly" directly +> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Canceling task "cancel" during comm +> [Tremblay:master:(1) 0.027003] [msg_test/INFO] Destroying task "finalize" during comm +> [Jupiter:slave:(2) 0.682345] [msg_test/INFO] Task "normal" done in 0.655342 (amount 0.000000) +> [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Handleling Task "cancel" +> [Jupiter:worker1:(3) 0.709348] [msg_test/INFO] Start cancel +> [Jupiter:slave:(2) 0.709348] [msg_test/INFO] Canceling task "cancel" +> [Jupiter:slave:(2) 0.709348] /home/bedaride/Boulot/simgrid/src/msg/msg_mailbox.c:129: [msg_mailbox/WARNING] Asked to write the received task in a non empty struct -- proceeding. +> [Jupiter:worker1:(3) 0.710127] [msg_test/INFO] Task done +> [Tremblay:master:(1) 0.736350] [msg_test/INFO] Goodbye now! +> [Jupiter:slave:(2) 0.736350] [msg_test/INFO] Handleling Task "finalize" +> [Jupiter:slave:(2) 0.736350] [msg_test/INFO] Destroying task "finalize" +> [Jupiter:slave:(2) 0.736350] [msg_test/INFO] I'm done. See you! +> [0.736350] [msg_test/INFO] Simulation time 0.73635