From 162a8e0a995ba53af16067994351a7d1c9f5cdc7 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 11 May 2016 20:13:54 +0200 Subject: [PATCH 1/1] teshfile: dont sort output --- examples/msg/async-wait/async-wait.tesh | 28 +++++++++++-------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/examples/msg/async-wait/async-wait.tesh b/examples/msg/async-wait/async-wait.tesh index cb3387cf79..ad11802309 100644 --- a/examples/msg/async-wait/async-wait.tesh +++ b/examples/msg/async-wait/async-wait.tesh @@ -2,15 +2,14 @@ p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver -! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../msg/async-wait/async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 1.000000] (2:receiver@Ruby) Wait to receive a task > [ 5.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 -> [ 5.100000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.100000] (2:receiver@Ruby) Received "Task_0" > [ 5.100000] (2:receiver@Ruby) Processing "Task_0" +> [ 5.100000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.609710] (2:receiver@Ruby) "Task_0" done > [ 5.609710] (2:receiver@Ruby) Wait to receive a task > [ 5.700000] (1:sender@Tremblay) Send to receiver-0 Task_2 @@ -24,21 +23,20 @@ $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${srcdir:=.}/small_platform_fatpipe.xml > [ 6.829130] (2:receiver@Ruby) "Task_2" done > [ 6.829130] (2:receiver@Ruby) Wait to receive a task > [ 6.900000] (1:sender@Tremblay) Goodbye now! -> [ 6.929130] (0:maestro@) Simulation time 6.92913 > [ 6.929130] (2:receiver@Ruby) Received "finalize" > [ 6.929130] (2:receiver@Ruby) I'm done. See you! +> [ 6.929130] (0:maestro@) Simulation time 6.92913 p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver -! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../msg/async-wait/async-wait2_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 > [ 1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 > [ 5.000000] (2:receiver@Ruby) Wait to receive a task -> [ 5.100000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.100000] (2:receiver@Ruby) Received "Task_0" > [ 5.100000] (2:receiver@Ruby) Processing "Task_0" +> [ 5.100000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.609710] (2:receiver@Ruby) "Task_0" done > [ 5.609710] (2:receiver@Ruby) Wait to receive a task > [ 5.700000] (1:sender@Tremblay) Send to receiver-0 Task_2 @@ -52,63 +50,61 @@ $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${srcdir:=.}/small_platform_fatpipe.xml > [ 6.829130] (2:receiver@Ruby) "Task_2" done > [ 6.829130] (2:receiver@Ruby) Wait to receive a task > [ 6.900000] (1:sender@Tremblay) Goodbye now! -> [ 6.929130] (0:maestro@) Simulation time 6.92913 > [ 6.929130] (2:receiver@Ruby) Received "finalize" > [ 6.929130] (2:receiver@Ruby) I'm done. See you! +> [ 6.929130] (0:maestro@) Simulation time 6.92913 p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver -! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../msg/async-wait/async-wait3_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 1.000000] (2:receiver@Ruby) Wait to receive a task > [ 5.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 -> [ 5.004022] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.004022] (2:receiver@Ruby) Received "Task_0" > [ 5.004022] (2:receiver@Ruby) Processing "Task_0" +> [ 5.004022] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.513732] (2:receiver@Ruby) "Task_0" done > [ 5.513732] (2:receiver@Ruby) Wait to receive a task -> [ 5.517753] (1:sender@Tremblay) Send to receiver-0 Task_2 > [ 5.517753] (2:receiver@Ruby) Received "Task_1" > [ 5.517753] (2:receiver@Ruby) Processing "Task_1" +> [ 5.517753] (1:sender@Tremblay) Send to receiver-0 Task_2 > [ 6.027463] (2:receiver@Ruby) "Task_1" done > [ 6.027463] (2:receiver@Ruby) Wait to receive a task -> [ 6.031485] (1:sender@Tremblay) Send to receiver-0 finalize > [ 6.031485] (2:receiver@Ruby) Received "Task_2" > [ 6.031485] (2:receiver@Ruby) Processing "Task_2" +> [ 6.031485] (1:sender@Tremblay) Send to receiver-0 finalize > [ 6.541195] (2:receiver@Ruby) "Task_2" done > [ 6.541195] (2:receiver@Ruby) Wait to receive a task -> [ 6.543146] (0:maestro@) Simulation time 6.54315 > [ 6.543146] (1:sender@Tremblay) Goodbye now! > [ 6.543146] (2:receiver@Ruby) Received "finalize" > [ 6.543146] (2:receiver@Ruby) I'm done. See you! +> [ 6.543146] (0:maestro@) Simulation time 6.54315 p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver -! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/async-wait ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../msg/async-wait/async-wait4_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) sleep_start_time : 1.000000 , sleep_test_time : 0.000000 > [ 0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000 > [ 1.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 > [ 5.000000] (2:receiver@Ruby) Wait to receive a task -> [ 5.004022] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.004022] (2:receiver@Ruby) Received "Task_0" > [ 5.004022] (2:receiver@Ruby) Processing "Task_0" +> [ 5.004022] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 5.513732] (2:receiver@Ruby) "Task_0" done > [ 5.513732] (2:receiver@Ruby) Wait to receive a task -> [ 5.517753] (1:sender@Tremblay) Send to receiver-0 Task_2 > [ 5.517753] (2:receiver@Ruby) Received "Task_1" > [ 5.517753] (2:receiver@Ruby) Processing "Task_1" +> [ 5.517753] (1:sender@Tremblay) Send to receiver-0 Task_2 > [ 6.027463] (2:receiver@Ruby) "Task_1" done > [ 6.027463] (2:receiver@Ruby) Wait to receive a task -> [ 6.031485] (1:sender@Tremblay) Send to receiver-0 finalize > [ 6.031485] (2:receiver@Ruby) Received "Task_2" > [ 6.031485] (2:receiver@Ruby) Processing "Task_2" +> [ 6.031485] (1:sender@Tremblay) Send to receiver-0 finalize > [ 6.541195] (2:receiver@Ruby) "Task_2" done > [ 6.541195] (2:receiver@Ruby) Wait to receive a task -> [ 6.543146] (0:maestro@) Simulation time 6.54315 > [ 6.543146] (1:sender@Tremblay) Goodbye now! > [ 6.543146] (2:receiver@Ruby) Received "finalize" > [ 6.543146] (2:receiver@Ruby) I'm done. See you! +> [ 6.543146] (0:maestro@) Simulation time 6.54315 -- 2.20.1