From 0a6c8726c3e15e934bf74df09171710e346db558 Mon Sep 17 00:00:00 2001 From: thiery Date: Tue, 1 Feb 2011 10:27:02 +0000 Subject: [PATCH] Protect --log=root.fmt flag with double quotes in tesh files git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9545 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/amok/bandwidth/bandwidth_rl.tesh | 6 ++-- examples/amok/saturate/saturate_rl.tesh | 10 +++--- examples/lua/mult_matrix.tesh | 2 +- examples/msg/actions/actions.tesh | 12 +++---- examples/msg/icomms/peer.tesh | 10 +++--- examples/msg/masterslave/masterslave.tesh | 2 +- .../msg/masterslave/masterslave_bypass.tesh | 2 +- .../msg/masterslave/masterslave_console.tesh | 2 +- .../msg/masterslave/masterslave_cpu_ti.tesh | 8 ++--- .../msg/masterslave/masterslave_failure.tesh | 2 +- .../masterslave/masterslave_forwarder.tesh | 2 +- .../msg/masterslave/masterslave_mailbox.tesh | 2 +- examples/msg/mc/bugged1.tesh | 2 +- examples/msg/mc/bugged2.tesh | 2 +- examples/msg/migration/migration.tesh | 2 +- examples/msg/parallel_task/parallel_task.tesh | 4 +-- examples/msg/priority/priority.tesh | 2 +- examples/msg/properties/msg_prop.tesh | 2 +- examples/msg/sendrecv/sendrecv_CLM03.tesh | 2 +- examples/msg/sendrecv/sendrecv_Reno.tesh | 2 +- examples/msg/sendrecv/sendrecv_Vegas.tesh | 2 +- examples/msg/suspend/suspend.tesh | 2 +- examples/msg/token_ring/token_ring.tesh | 4 +-- examples/msg/trace/trace.tesh | 22 ++++++------ examples/msg/tracing/ms.tesh | 2 +- teshsuite/gras/datadesc/datadesc_mem.tesh | 2 +- .../gras/datadesc/datadesc_r_big32_8_4.tesh | 2 +- .../gras/datadesc/datadesc_r_little32_4.tesh | 2 +- .../gras/datadesc/datadesc_r_little64.tesh | 2 +- teshsuite/gras/datadesc/datadesc_rw.tesh | 4 +-- teshsuite/msg/get_sender.tesh | 2 +- teshsuite/simdag/basic0.tesh | 2 +- teshsuite/simdag/basic1.tesh | 2 +- teshsuite/simdag/basic2.tesh | 2 +- teshsuite/simdag/basic3.tesh | 2 +- teshsuite/simdag/basic4.tesh | 2 +- teshsuite/simdag/basic5.tesh | 2 +- teshsuite/simdag/basic6.tesh | 2 +- .../network/mxn/test_intra_all2all.tesh | 2 +- .../mxn/test_intra_independent_comm.tesh | 2 +- .../network/mxn/test_intra_scatter.tesh | 2 +- .../simdag/network/p2p/test_latency1.tesh | 6 ++-- .../simdag/network/p2p/test_latency2.tesh | 6 ++-- .../simdag/network/p2p/test_latency3.tesh | 6 ++-- .../network/p2p/test_latency_bound.tesh | 2 +- .../simdag/network/test_reinit_costs.tesh | 2 +- .../simdag/partask/test_comp_only_par.tesh | 4 +-- .../simdag/partask/test_comp_only_seq.tesh | 2 +- .../simdag/platforms/basic_parsing_test.tesh | 34 +++++++++---------- .../platforms/basic_parsing_test_failing.tesh | 4 +-- .../basic_parsing_test_sym_full.tesh | 8 ++--- teshsuite/simdag/platforms/flatifier.tesh | 34 +++++++++---------- .../simdag/platforms/two_hosts_asymetric.tesh | 4 +-- teshsuite/xbt/log_large_test.tesh | 4 +-- teshsuite/xbt/parallel_log_crashtest.tesh | 2 +- 55 files changed, 131 insertions(+), 131 deletions(-) diff --git a/examples/amok/bandwidth/bandwidth_rl.tesh b/examples/amok/bandwidth/bandwidth_rl.tesh index ef963095ca..268c220694 100755 --- a/examples/amok/bandwidth/bandwidth_rl.tesh +++ b/examples/amok/bandwidth/bandwidth_rl.tesh @@ -1,13 +1,13 @@ ! timeout 20 -& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS > sensor:main Sensor starting (on port 3000) ! timeout 20 -& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS > sensor:main Sensor starting (on port 3001) ! timeout 20 -& $SG_TEST_ENV bandwidth/bandwidth_maestro$EXEEXT 6000 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV bandwidth/bandwidth_maestro$EXEEXT 6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS > maestro:main Maestro starting > maestro:main Wait for peers for 5 sec > maestro:main Contact 127.0.0.1:3000 diff --git a/examples/amok/saturate/saturate_rl.tesh b/examples/amok/saturate/saturate_rl.tesh index 60c187d78b..7b590580f4 100755 --- a/examples/amok/saturate/saturate_rl.tesh +++ b/examples/amok/saturate/saturate_rl.tesh @@ -1,14 +1,14 @@ ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS ! timeout 20 -& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS ! timeout 20 -& $SG_TEST_ENV saturate/saturate_maestro$EXEEXT 3333 --log=root.fmt=%P:%t%e%m%n $ARGS +& $SG_TEST_ENV saturate/saturate_maestro$EXEEXT 3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS diff --git a/examples/lua/mult_matrix.tesh b/examples/lua/mult_matrix.tesh index 6b389bad9d..c2891faadf 100644 --- a/examples/lua/mult_matrix.tesh +++ b/examples/lua/mult_matrix.tesh @@ -3,7 +3,7 @@ # Later modify the commande and specify the platform and deployment path ! output sort -$ lua mult_matrix.lua --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ lua mult_matrix.lua "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:Sender@Inmos) Hello From Sender > [ 0.000000] (1:Sender@Inmos) Argc=4 (should be 4) > [ 0.000000] (1:Sender@Inmos) Sending matrix_task to Bellevue diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh index 2977d07c29..6edc971307 100644 --- a/examples/msg/actions/actions.tesh +++ b/examples/msg/actions/actions.tesh @@ -2,7 +2,7 @@ ! output sort -$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [500.005200] (1:p0@host0) p0 recv p1 500.005200 > [500.005200] (2:p1@host1) p1 send p0 1e10 500.005200 > [500.005201] (1:p0@host0) p0 compute 12 0.000001 @@ -10,7 +10,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deplo > [512.005200] (2:p1@host1) p1 sleep 12 12.000000 ! output sort -$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [100.010400] (1:p0@host0) p0 allReduce 5e8 5e8 100.010400 > [100.010400] (2:p1@host1) p1 allReduce 5e8 5e8 100.010400 @@ -21,7 +21,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deplo > [150.010400] (3:p2@host2) p2 compute 5e8 50.000000 ! output sort -$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_barrier.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_barrier.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 0.000000] (2:p1@host1) p1 comm_size 3 0.000000 > [ 0.000000] (3:p2@host2) p2 comm_size 3 0.000000 @@ -33,7 +33,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deplo > [ 0.955200] (1:p0@host0) p0 compute 4.5E6 0.450000 ! output sort -$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_bcast.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_bcast.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 25.005200] (1:p0@host0) p0 bcast 5e8 25.005200 > [ 25.005200] (2:p1@host1) p1 bcast 5e8 25.005200 @@ -53,7 +53,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deplo > [225.015600] (1:p0@host0) p0 reduce 5e8 5e8 75.005200 ! output sort -$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_reduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_reduce.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 25.005200] (2:p1@host1) p1 reduce 5e8 5e8 25.005200 > [ 25.005200] (3:p2@host2) p2 reduce 5e8 5e8 25.005200 @@ -64,7 +64,7 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deplo > [125.005200] (1:p0@host0) p0 compute 5e8 50.000000 ! output sort -$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (2:p1@host1) p1 Irecv p0 0.000000 > [ 0.000000] (3:p2@host2) p2 Irecv p1 0.000000 > [ 50.000000] (3:p2@host2) p2 compute 5e8 50.000000 diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh index 371d681eec..2481f7cb70 100644 --- a/examples/msg/icomms/peer.tesh +++ b/examples/msg/icomms/peer.tesh @@ -5,7 +5,7 @@ p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver ! output sort -$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer01.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer01.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 @@ -34,7 +34,7 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer01.xml --lo p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver ! output sort -$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer02.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer02.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 @@ -63,7 +63,7 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer02.xml --lo p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver ! output sort -$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer03.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer03.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 @@ -92,7 +92,7 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer03.xml --lo p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver ! output sort -$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer04.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer04.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 @@ -121,7 +121,7 @@ $ ./peer ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer04.xml --lo p Test1 MSG_comm_waitall() for sender ! output sort -$ ./peer2 ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ./peer2 ${srcdir:=.}/small_platform.xml ${srcdir:=.}/deployment_peer.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_1 > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_2 diff --git a/examples/msg/masterslave/masterslave.tesh b/examples/msg/masterslave/masterslave.tesh index 8506b60cf0..e7acbcff33 100644 --- a/examples/msg/masterslave/masterslave.tesh +++ b/examples/msg/masterslave/masterslave.tesh @@ -3,7 +3,7 @@ p Testing a simple master/slave example application ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --trace --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" to "Jupiter" > [ 0.165962] (1:master@Tremblay) Sent diff --git a/examples/msg/masterslave/masterslave_bypass.tesh b/examples/msg/masterslave/masterslave_bypass.tesh index 3e870c9ee1..b4527aabf3 100644 --- a/examples/msg/masterslave/masterslave_bypass.tesh +++ b/examples/msg/masterslave/masterslave_bypass.tesh @@ -2,7 +2,7 @@ p Testing the bypassing of the flexml parser ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV masterslave/masterslave_bypass --log=no_loc "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [ 0.000000] (1:master@host A) Got 1 slave(s) : > [ 0.000000] (1:master@host A) host B diff --git a/examples/msg/masterslave/masterslave_console.tesh b/examples/msg/masterslave/masterslave_console.tesh index c847502eec..4c7457b967 100644 --- a/examples/msg/masterslave/masterslave_console.tesh +++ b/examples/msg/masterslave/masterslave_console.tesh @@ -1,7 +1,7 @@ #! ./tesh ! output sort -$ $SG_TEST_EXENV masterslave_console ${srcdir:=.}/platform_script.lua --log=surf_parse.thres:critical --log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV masterslave_console ${srcdir:=.}/platform_script.lua --log=surf_parse.thres:critical "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master@Tremblay) Got 4 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0" > [ 221.119476] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1" diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh index 6de7a213ad..354343d44e 100644 --- a/examples/msg/masterslave/masterslave_cpu_ti.tesh +++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh @@ -3,7 +3,7 @@ p Testing a simple master/slave example application ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT small_platform.xml masterslave/deployment_masterslave.xml --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT small_platform.xml masterslave/deployment_masterslave.xml --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process @@ -128,7 +128,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT small_platform.xml ma p Testing a master/slave example application with a forwarder module ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process @@ -279,7 +279,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/masterslave_forwarder$EXEEXT msg_platform.xml mast p Testing a simple master/slave example application handling failures ! output sort -$ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) > [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : @@ -374,7 +374,7 @@ $ ${bindir:=.}/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_ p Testing the bypassing of the flexml parser ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' > [ 0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [ 0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s) diff --git a/examples/msg/masterslave/masterslave_failure.tesh b/examples/msg/masterslave/masterslave_failure.tesh index d5b87d794b..edbfc332e5 100644 --- a/examples/msg/masterslave/masterslave_failure.tesh +++ b/examples/msg/masterslave/masterslave_failure.tesh @@ -3,7 +3,7 @@ p Testing a simple master/slave example application handling failures ! output sort -$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_loc ${srcdir:=.}/small_platform_with_failures.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Cannot launch process 'slave' on failed host 'Fafard' > [ 0.000000] (1:master@Tremblay) Got 5 slave(s) : > [ 0.000000] (1:master@Tremblay) Jupiter diff --git a/examples/msg/masterslave/masterslave_forwarder.tesh b/examples/msg/masterslave/masterslave_forwarder.tesh index dac111d7a3..cd286fdb78 100644 --- a/examples/msg/masterslave/masterslave_forwarder.tesh +++ b/examples/msg/masterslave/masterslave_forwarder.tesh @@ -3,7 +3,7 @@ p Testing a master/slave example application with a forwarder module ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master@Jacquelin) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Jacquelin) Sending "Task_0" to "iRMX" > [ 4.772530] (1:master@Jacquelin) Sent diff --git a/examples/msg/masterslave/masterslave_mailbox.tesh b/examples/msg/masterslave/masterslave_mailbox.tesh index 290642957a..18febe0f6b 100644 --- a/examples/msg/masterslave/masterslave_mailbox.tesh +++ b/examples/msg/masterslave/masterslave_mailbox.tesh @@ -3,7 +3,7 @@ p Testing a simple master/slave example application (mailbox version) ! output sort -$ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox.xml --trace --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV masterslave/masterslave_mailbox$EXEEXT ${srcdir:=.}/small_platform_with_routers.xml ${srcdir:=.}/masterslave/deployment_masterslave_mailbox.xml --trace "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:master@Tremblay) Got 5 slaves and 20 tasks to process > [ 0.000000] (1:master@Tremblay) Sending "Task_0" (of 20) to mailbox "slave-0" > [ 0.002339] (1:master@Tremblay) Sending "Task_1" (of 20) to mailbox "slave-1" diff --git a/examples/msg/mc/bugged1.tesh b/examples/msg/mc/bugged1.tesh index 7ce5510643..61c8dc8d8d 100644 --- a/examples/msg/mc/bugged1.tesh +++ b/examples/msg/mc/bugged1.tesh @@ -1,7 +1,7 @@ #! ./tesh ! output sort -$ ${bindir:=.}/bugged1 --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/bugged1 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.008753] (2:client@HostB) Sent! > [ 0.017506] (3:client@HostC) Sent! > [ 0.026259] (1:server@HostA) OK diff --git a/examples/msg/mc/bugged2.tesh b/examples/msg/mc/bugged2.tesh index 6471f0398f..57429e09d0 100644 --- a/examples/msg/mc/bugged2.tesh +++ b/examples/msg/mc/bugged2.tesh @@ -1,7 +1,7 @@ #! ./tesh ! output sort -$ ${bindir:=.}/bugged2 --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/bugged2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (2:client@HostB) Send 1! > [ 0.000000] (3:client@HostC) Send 2! > [ 0.008753] (1:server@HostA) Received 1 diff --git a/examples/msg/migration/migration.tesh b/examples/msg/migration/migration.tesh index 6ed1f1bd1f..a75120d021 100644 --- a/examples/msg/migration/migration.tesh +++ b/examples/msg/migration/migration.tesh @@ -3,7 +3,7 @@ p Testing the migration feature of MSG ! output sort -$ $SG_TEST_EXENV migration/migration ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/migration/migration.deploy --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV migration/migration ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/migration/migration.deploy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener. > [ 0.000000] (1:emigrant@Boivin) Yeah, found something to do > [ 3.000000] (1:emigrant@Boivin) Moving back home after work diff --git a/examples/msg/parallel_task/parallel_task.tesh b/examples/msg/parallel_task/parallel_task.tesh index fd2689809b..83f267f7ac 100644 --- a/examples/msg/parallel_task/parallel_task.tesh +++ b/examples/msg/parallel_task/parallel_task.tesh @@ -3,14 +3,14 @@ p Testing a simple master/slave example application ! output sort -$ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/small_platform.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) type in variable = 2 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 0.009378] (0:@) Simulation time 0.00937836 > [ 0.009378] (1:test@Ginette) Goodbye now! ! output sort -$ $SG_TEST_EXENV parallel_task/test_ptask$EXEEXT ${srcdir:=.}/parallel_task/test_ptask_platform.xml ${srcdir:=.}/parallel_task/test_ptask_deployment.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV parallel_task/test_ptask$EXEEXT ${srcdir:=.}/parallel_task/test_ptask_platform.xml ${srcdir:=.}/parallel_task/test_ptask_deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) type in variable = 2 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 1.000300] (1:execute@Ginette) execution_time=1.0003 diff --git a/examples/msg/priority/priority.tesh b/examples/msg/priority/priority.tesh index 0d79753abf..cc360ad4c3 100644 --- a/examples/msg/priority/priority.tesh +++ b/examples/msg/priority/priority.tesh @@ -3,7 +3,7 @@ p Testing a simple master/slave example application ! output sort -$ $SG_TEST_EXENV priority/priority$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/priority/deployment_priority.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV priority/priority$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/priority/deployment_priority.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 1 > [ 0.000000] (2:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 2 > [ 1.500000] (2:test@Fafard) Goodbye now! diff --git a/examples/msg/properties/msg_prop.tesh b/examples/msg/properties/msg_prop.tesh index 472d8f9362..bb65d1a937 100644 --- a/examples/msg/properties/msg_prop.tesh +++ b/examples/msg/properties/msg_prop.tesh @@ -3,7 +3,7 @@ p Testing a MSG application with properties in the XML for Hosts, Links and Processes ! output sort -$ $SG_TEST_EXENV properties/msg_prop$EXEEXT ${srcdir:=.}/../platforms/prop.xml ${srcdir:=.}/properties/deployment_properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV properties/msg_prop$EXEEXT ${srcdir:=.}/../platforms/prop.xml ${srcdir:=.}/properties/deployment_properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:alice@host1) == Print the properties of the host > [ 0.000000] (1:alice@host1) Host property: 'SG_TEST_Hdd' -> '180' > [ 0.000000] (1:alice@host1) Host property: 'SG_TEST_mem' -> '4' diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh index 77ee06e766..04789d4d74 100644 --- a/examples/msg/sendrecv/sendrecv_CLM03.tesh +++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh @@ -3,7 +3,7 @@ p Testing the surf network maxmin fairness model ! output sort -$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02 --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'CLM03' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' diff --git a/examples/msg/sendrecv/sendrecv_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh index 296f8a02b7..6d587ab0b2 100644 --- a/examples/msg/sendrecv/sendrecv_Reno.tesh +++ b/examples/msg/sendrecv/sendrecv_Reno.tesh @@ -4,7 +4,7 @@ p Testing the surf network Reno fairness model using lagrangian approach ! output sort -$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Reno' diff --git a/examples/msg/sendrecv/sendrecv_Vegas.tesh b/examples/msg/sendrecv/sendrecv_Vegas.tesh index 32229e4222..b742fa426b 100644 --- a/examples/msg/sendrecv/sendrecv_Vegas.tesh +++ b/examples/msg/sendrecv/sendrecv_Vegas.tesh @@ -3,7 +3,7 @@ p Testing the surf network Vegas fairness model using lagrangian approach ! output sort -$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'Vegas' diff --git a/examples/msg/suspend/suspend.tesh b/examples/msg/suspend/suspend.tesh index 51d26f60e8..d6177b10d2 100644 --- a/examples/msg/suspend/suspend.tesh +++ b/examples/msg/suspend/suspend.tesh @@ -3,7 +3,7 @@ p Testing the suspend/resume feature of MSG ! output sort -$ $SG_TEST_EXENV suspend/suspend ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/suspend/deployment_suspend.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV suspend/suspend ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/suspend/deployment_suspend.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:dream_master@Jacquelin) Let's create a lazy guy. > [ 0.000000] (1:dream_master@Jacquelin) Let's wait a little bit... > [ 0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep. diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh index 4794a928c0..bd804a0cb1 100644 --- a/examples/msg/token_ring/token_ring.tesh +++ b/examples/msg/token_ring/token_ring.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [ 0.066240] [1:master@alice1.crepe.fr] Send Data to "host1" > [ 0.066240] [2:slave@alice4.crepe.fr] Received "Token" @@ -24,7 +24,7 @@ $ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml --log=root.fmt:[%10.6r > [ 1.148160] [10:slave@bob1.hamburger.edu] Send Data to "host0" > [ 1.148160] [0:@] Simulation time 1.14816 -$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_peers.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_peers.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code. > [5111.488529] [1:master@peer_100036570] Send Data to "host1" > [5111.488529] [2:slave@peer_100030591] Received "Token" diff --git a/examples/msg/trace/trace.tesh b/examples/msg/trace/trace.tesh index 5efce28347..3df7e62ab6 100644 --- a/examples/msg/trace/trace.tesh +++ b/examples/msg/trace/trace.tesh @@ -3,7 +3,7 @@ p Testing trace integration using file.trace and test1.xml, a < max(time), b < max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -15,7 +15,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1. p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -28,7 +28,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test2. p Testing trace integration using file.trace and test3.xml, a < max(time), b > 2 max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -40,7 +40,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test3. p Testing trace integration using file.trace and test4.xml, max(time) < a < 2max(time), max(time) < b < 2max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -52,7 +52,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test4. p Testing trace integration using file.trace and test5.xml, max(time) < a < 2max(time), 2max(time) < b < 3max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -64,7 +64,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test5. p Testing trace integration using file.trace and test6.xml, max(time) < a < 2max(time), b > 3max(time) ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -76,7 +76,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test6. p Testing trace integration using file.trace and test7.xml, two process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -92,7 +92,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test7. p Testing trace integration using file.trace and test8.xml, two process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -108,7 +108,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test8. p Testing trace integration using file.trace and test9.xml, three process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -128,7 +128,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test9. p Testing trace integration using file.trace and test10.xml, three process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' @@ -148,7 +148,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test10 p Testing trace integration using file.trace and test11.xml, three process with different priority. Changed timestep to 0.1. ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test11.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound' > [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02' > [ 0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI' diff --git a/examples/msg/tracing/ms.tesh b/examples/msg/tracing/ms.tesh index e2294aabef..ec6fee3996 100644 --- a/examples/msg/tracing/ms.tesh +++ b/examples/msg/tracing/ms.tesh @@ -2,7 +2,7 @@ p Tracing master/slave application -$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist --log=instr_paje.thres:debug --log=instr_paje_trace.thres:debug --log=root.fmt:[%10.6r]%e\(%i:%P@%h\)%e%m%n ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml +$ $SG_TEST_EXENV ${bindir:=.}/tracing/ms$EXEEXT --cfg=tracing:1 --cfg=tracing/filename:tracing/ms.trace --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1 --cfg=triva/categorized:tracing/ms.cat.plist --cfg=triva/uncategorized:tracing/ms.uncat.plist --log=instr_paje.thres:debug --log=instr_paje_trace.thres:debug "--log=root.fmt:[%10.6r]%e\(%i:%P@%h\)%e%m%n" ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml > [ 0.000000] (0:@) Configuration change: Set 'tracing' to '1' > [ 0.000000] (0:@) Configuration change: Set 'tracing/filename' to 'tracing/ms.trace' > [ 0.000000] (0:@) Configuration change: Set 'tracing/categorized' to '1' diff --git a/teshsuite/gras/datadesc/datadesc_mem.tesh b/teshsuite/gras/datadesc/datadesc_mem.tesh index dad96113f2..a49e13e161 100644 --- a/teshsuite/gras/datadesc/datadesc_mem.tesh +++ b/teshsuite/gras/datadesc/datadesc_mem.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to to do a in-memory copy) -$ gras/datadesc/datadesc_usage --copy --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --copy "--log=root.fmt:%m%n" > Memory copy > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh b/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh index a374dc449e..8b2013f5a5 100644 --- a/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_big32_8_4.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read the result of AIX) -$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.big32_8_4 --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.big32_8_4 "--log=root.fmt:%m%n" > Read from file datadesc.big32_8_4 > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh b/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh index b3bd754fd4..53ffc59c63 100644 --- a/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_little32_4.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read the result of linux/x86) -$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little32_4 --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little32_4 "--log=root.fmt:%m%n" > Read from file datadesc.little32_4 > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras/datadesc/datadesc_r_little64.tesh b/teshsuite/gras/datadesc/datadesc_r_little64.tesh index 4e02e4af24..b07c87b38c 100644 --- a/teshsuite/gras/datadesc/datadesc_r_little64.tesh +++ b/teshsuite/gras/datadesc/datadesc_r_little64.tesh @@ -1,6 +1,6 @@ p Check the marshaling facilities (trying to read the result of linux/amd64) -$ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64 --log=root.fmt:%m%n $ARGS +$ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64 "--log=root.fmt:%m%n" $ARGS > Read from file datadesc.little64 > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/gras/datadesc/datadesc_rw.tesh b/teshsuite/gras/datadesc/datadesc_rw.tesh index 16db2efcd7..d13f672abe 100644 --- a/teshsuite/gras/datadesc/datadesc_rw.tesh +++ b/teshsuite/gras/datadesc/datadesc_rw.tesh @@ -2,7 +2,7 @@ p Check the marshaling facilities (trying to read what we write) $ rm -f datadesc_usage.out -$ gras/datadesc/datadesc_usage --write --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --write "--log=root.fmt:%m%n" > Write to file datadesc_usage.out > ---- Test on integer ---- > ---- Test on float ---- @@ -25,7 +25,7 @@ $ gras/datadesc/datadesc_usage --write --log=root.fmt:%m%n > ---- Test on struct containing dynamic array and its size when size=0 (cbps test) ---- > Exiting GRAS -$ gras/datadesc/datadesc_usage --read --log=root.fmt:%m%n +$ gras/datadesc/datadesc_usage --read "--log=root.fmt:%m%n" > Read from file datadesc_usage.out > ---- Test on integer ---- > ---- Test on float ---- diff --git a/teshsuite/msg/get_sender.tesh b/teshsuite/msg/get_sender.tesh index 18169cc6ab..8d5d0d51fb 100644 --- a/teshsuite/msg/get_sender.tesh +++ b/teshsuite/msg/get_sender.tesh @@ -1,5 +1,5 @@ ! output sort -$ msg/get_sender ${srcdir:=.}/msg/get_sender.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ msg/get_sender ${srcdir:=.}/msg/get_sender.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:send@toto) Sending > [ 0.000000] (2:receive@toto) Receiving > [ 0.000000] (2:receive@toto) Got a message sent by 'send' diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh index 9eb3cd906e..a8eeb8d708 100644 --- a/teshsuite/simdag/basic0.tesh +++ b/teshsuite/simdag/basic0.tesh @@ -1,3 +1,3 @@ -$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 1.000100] (0:@) Simulation time: 1.000100 diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh index 92e5ef4719..44e5a7e119 100644 --- a/teshsuite/simdag/basic1.tesh +++ b/teshsuite/simdag/basic1.tesh @@ -1,3 +1,3 @@ -$ simdag/basic1 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic1 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 16.000100] (0:@) Simulation time: 16.000100 diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh index 42976e182c..011f97ef69 100644 --- a/teshsuite/simdag/basic2.tesh +++ b/teshsuite/simdag/basic2.tesh @@ -1,3 +1,3 @@ -$ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 10.600100] (0:@) Simulation time: 10.600100 diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh index aa8fad952e..ac9a3c11b5 100644 --- a/teshsuite/simdag/basic3.tesh +++ b/teshsuite/simdag/basic3.tesh @@ -1,3 +1,3 @@ -$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 0.000000] (0:@) Simulation time: 0.000000 diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh index 9fc3132743..b098d980ca 100644 --- a/teshsuite/simdag/basic4.tesh +++ b/teshsuite/simdag/basic4.tesh @@ -1,3 +1,3 @@ -$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 0.000100] (0:@) Simulation time: 0.000100 diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh index 30420228d4..21d5814798 100644 --- a/teshsuite/simdag/basic5.tesh +++ b/teshsuite/simdag/basic5.tesh @@ -1,3 +1,3 @@ -$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 0.002500] (0:@) Simulation time: 0.002500 diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh index df6ea58a2c..a90cca698e 100644 --- a/teshsuite/simdag/basic6.tesh +++ b/teshsuite/simdag/basic6.tesh @@ -1,4 +1,4 @@ -$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > [ 2.000000] (0:@) Simulation time: 2.000000 diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh index 1e12d7d7c1..4cd33039a7 100644 --- a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh @@ -1,6 +1,6 @@ p all 2 all test, only fat pipe switch is used concurrently -$ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 8 diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh index 5ff4c3d832..a23ab6b99a 100644 --- a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh @@ -1,6 +1,6 @@ p sending on different paths test -$ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 3 diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh index ad7384babc..3e74e9ae9a 100644 --- a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh +++ b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh @@ -1,7 +1,7 @@ p scatter test -$ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 8 diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh index 8b37fdf309..6ac5aff350 100644 --- a/teshsuite/simdag/network/p2p/test_latency1.tesh +++ b/teshsuite/simdag/network/p2p/test_latency1.tesh @@ -1,19 +1,19 @@ p latency check, 1 byte, shared link -$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 p latency check, 1 byte, fat pipe -$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 p latency check, 1 byte, link - switch - link -$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 3 diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh index bee669ef1b..42fbdb19ed 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.tesh +++ b/teshsuite/simdag/network/p2p/test_latency2.tesh @@ -1,19 +1,19 @@ p latency check, 2 x 1 byte, same direction, shared link -$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 2.5 p latency check, 2 x 1 byte, same direction, fat pipe -$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 p latency check, 2 x 1 byte, same direction, link - switch - link -$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 4 diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh index 19338759c1..c27dcd390e 100644 --- a/teshsuite/simdag/network/p2p/test_latency3.tesh +++ b/teshsuite/simdag/network/p2p/test_latency3.tesh @@ -1,19 +1,19 @@ p latency check, 2 x 1 byte, opposite direction, shared link -$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 2.5 p latency check, 2 x 1 byte, opposite direction, fat pipe -$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1.5 p latency check, 2 x 1 byte, opposite direction, link - switch - link -$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 4 diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/test_latency_bound.tesh index e47412be18..a5c405382c 100644 --- a/teshsuite/simdag/network/p2p/test_latency_bound.tesh +++ b/teshsuite/simdag/network/p2p/test_latency_bound.tesh @@ -1,6 +1,6 @@ p latency bounded by large latency link -$ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 10001.5 diff --git a/teshsuite/simdag/network/test_reinit_costs.tesh b/teshsuite/simdag/network/test_reinit_costs.tesh index c017a26af5..8a375cdad1 100644 --- a/teshsuite/simdag/network/test_reinit_costs.tesh +++ b/teshsuite/simdag/network/test_reinit_costs.tesh @@ -1,7 +1,7 @@ p Reinitialization test -$ simdag/network/test_reinit_costs ${srcdir:=.}/simdag/network/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/network/test_reinit_costs ${srcdir:=.}/simdag/network/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 0 > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh index b53988e3dd..51fa74e8fb 100644 --- a/teshsuite/simdag/partask/test_comp_only_par.tesh +++ b/teshsuite/simdag/partask/test_comp_only_par.tesh @@ -1,12 +1,12 @@ p par task comp only, no comm, homogeneous -$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1 p par task comp only, no comm, heterogeneous -$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1 diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh index b8e4a6e2d9..334b5381be 100644 --- a/teshsuite/simdag/partask/test_comp_only_seq.tesh +++ b/teshsuite/simdag/partask/test_comp_only_seq.tesh @@ -1,6 +1,6 @@ p seq task comp only, no comm -$ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --surf-path=${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > 1 diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 7c910f4328..36ee7cdcbe 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -1,68 +1,68 @@ -$ ${bindir:=.}/basic_parsing_test one_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 5, link number: 8 -$ ${bindir:=.}/basic_parsing_test one_host_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host_properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host_state_off.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_state_off.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host_state_on.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_state_on.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_host.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_host.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic_parsing_test one_link_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ${bindir:=.}/basic_parsing_test one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ${bindir:=.}/basic_parsing_test one_link_shared.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_shared.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ${bindir:=.}/basic_parsing_test one_link_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_link_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 1, link number: 2 -$ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 3, link number: 4 -$ ${bindir:=.}/basic_parsing_test two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 10, link number: 16 -$ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 4 -$ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 2 diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh index 82b701d355..c7a8495dfe 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh @@ -1,7 +1,7 @@ ! output sort -$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'path' to 'simdag/platforms' ! output sort -$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) Configuration change: Set 'path' to 'simdag/platforms' diff --git a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh index da7dd15281..790c9d13ba 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_sym_full.tesh @@ -1,5 +1,5 @@ #! ./tesh -$ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 5, link number: 14 > Route between bob3.hamburger.edu and bob3.hamburger.edu @@ -153,7 +153,7 @@ $ ${bindir:=.}/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --log=roo > Link bob_cluster_link_6_DOWN: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 -$ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 4, link number: 10 > Route between bob1.hamburger.edu and bob1.hamburger.edu @@ -285,7 +285,7 @@ $ ${bindir:=.}/basic_parsing_test two_clusters_symmetric.xml FULL_LINK --log=roo > Link alice_cluster_link_1: latency = 0.000050, bandwidth = 125000000.000000 > Route latency = 0.000600, route bandwidth = 125000000.000000 -$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 4 > Route between alice and alice @@ -309,7 +309,7 @@ $ ${bindir:=.}/basic_parsing_test two_hosts_one_link_symmetrical.xml FULL_LINK - > Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 > Route latency = 0.000015, route bandwidth = 498000000.000000 -$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n +$ ${bindir:=.}/basic_parsing_test two_hosts_one_link_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 3 > Route between alice and alice diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index cd06360f42..98ae37ab09 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -131,7 +131,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@ > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -145,7 +145,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -163,7 +163,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -177,7 +177,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -191,7 +191,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -205,7 +205,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[ > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -219,7 +219,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -233,7 +233,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r > > -$ ${bindir:=.}/flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -247,7 +247,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h] > > -$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -262,7 +262,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r > > -$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -277,7 +277,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[% > > -$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -292,7 +292,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i > > -$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -307,7 +307,7 @@ $ ${bindir:=.}/flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -350,7 +350,7 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.f > > -$ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -819,7 +819,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P > > -$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > @@ -846,7 +846,7 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > > diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric.tesh b/teshsuite/simdag/platforms/two_hosts_asymetric.tesh index a4dce9b25d..81a5be4a25 100644 --- a/teshsuite/simdag/platforms/two_hosts_asymetric.tesh +++ b/teshsuite/simdag/platforms/two_hosts_asymetric.tesh @@ -1,9 +1,9 @@ ! expect signal SIGABRT -$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > [ 0.000000] [0:@] Error while loading two_hosts_asymetric_BOGUS.xml: The route between "alice" and "bob" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. ! expect signal SIGABRT -$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS2.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n +$ ${bindir:=.}/flatifier two_hosts_asymetric_BOGUS2.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07 > [ 0.000000] [0:@] Error while loading two_hosts_asymetric_BOGUS2.xml: The route between "alice" and "bob" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags. diff --git a/teshsuite/xbt/log_large_test.tesh b/teshsuite/xbt/log_large_test.tesh index d156d7f8af..ef133625be 100644 --- a/teshsuite/xbt/log_large_test.tesh +++ b/teshsuite/xbt/log_large_test.tesh @@ -1,6 +1,6 @@ p Check that the dynamic version of the log simple layout works -$ $SG_EXENV_TEST xbt/log_large_test --log=root.fmt:%m%n +$ $SG_EXENV_TEST xbt/log_large_test "--log=root.fmt:%m%n" > This is a very large message: > 0 > 1.........1.........2.........3.........4.........5.........6.........7.........8.........9.........0 @@ -116,7 +116,7 @@ $ $SG_EXENV_TEST xbt/log_large_test --log=root.fmt:%m%n > Done (strlen>10210) p Check that the dynamic version of the log formated layout works -$ $SG_EXENV_TEST xbt/log_large_test --log=root.fmt:%m%n +$ $SG_EXENV_TEST xbt/log_large_test "--log=root.fmt:%m%n" > This is a very large message: > 0 > 1.........1.........2.........3.........4.........5.........6.........7.........8.........9.........0 diff --git a/teshsuite/xbt/parallel_log_crashtest.tesh b/teshsuite/xbt/parallel_log_crashtest.tesh index fcd72f5249..ef7094fb24 100644 --- a/teshsuite/xbt/parallel_log_crashtest.tesh +++ b/teshsuite/xbt/parallel_log_crashtest.tesh @@ -1,7 +1,7 @@ ! timeout 20 p Try to crash the log mecanism by using it in parallel with a lot of threads -$ xbt/parallel_log_crashtest --log=root.fmt:%m%n +$ xbt/parallel_log_crashtest "--log=root.fmt:%m%n" > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) > XXX (XX|XX|XX|XX|XX|XX|XX|XX|XX) -- 2.20.1