X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d117138066c37a0da006ff32114575367fdaa9bf..cc1b3b032993e915ce23498c7edd3d404ea6288f:/examples/c/platform-failures/platform-failures.tesh

diff --git a/examples/c/platform-failures/platform-failures.tesh b/examples/c/platform-failures/platform-failures.tesh
index e258993ced..ba91e26100 100644
--- a/examples/c/platform-failures/platform-failures.tesh
+++ b/examples/c/platform-failures/platform-failures.tesh
@@ -3,7 +3,7 @@
 p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED
 
 ! output sort 19
-$ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose
+$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_cpu.t:verbose
 > [  0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard'
 > [  0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind.
 > [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
@@ -15,12 +15,12 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p
 > [  0.000000] (5:worker@Ginette) Waiting a message on worker-3
 > [  0.000000] (6:worker@Bourassa) Waiting a message on worker-4
 > [  0.010309] (1:master@Tremblay) Send a message to worker-1
-> [  1.000000] (0:maestro@) Restart processes on host Fafard
+> [  1.000000] (0:maestro@) Restart actors on host Fafard
 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
-> [  2.000000] (0:maestro@) Restart processes on host Jupiter
+> [  2.000000] (0:maestro@) Restart actors on host Jupiter
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.010309] (2:worker@Tremblay) Execution complete.
@@ -108,7 +108,7 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p
 p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED
 
 ! output sort 19
-$ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose
+$ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_cpu.t:verbose
 > [  0.000000] (0:maestro@) Cannot launch actor 'worker' on failed host 'Fafard'
 > [  0.000000] (0:maestro@) Deployment includes some initially turned off Hosts ... nevermind.
 > [  0.000000] (1:master@Tremblay) Got 5 workers and 20 tasks to process
@@ -120,11 +120,11 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p
 > [  0.010825] (2:worker@Tremblay) Start execution...
 > [  0.010825] (1:master@Tremblay) Send to worker-0 completed
 > [  0.010825] (1:master@Tremblay) Send a message to worker-1
-> [  1.000000] (0:maestro@) Restart processes on host Fafard
+> [  1.000000] (0:maestro@) Restart actors on host Fafard
 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
-> [  2.000000] (0:maestro@) Restart processes on host Jupiter
+> [  2.000000] (0:maestro@) Restart actors on host Jupiter
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
@@ -210,11 +210,11 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p
 > [ 43.774742] (1:master@Tremblay) Goodbye now!
 > [ 43.774742] (0:maestro@) Simulation time 43.7747
 
-p NOT testing the mixure of failures and CpuTI: 
+p NOT testing the mixture of failures and CpuTI: 
 p This test leads to a deadlock because of a bug somewhere in surf_solve.
 p We should debug this instead of ignoring the issue, but it's utterly
 p   complex with such an integration test. One day, we will setup a set of
 p   unit tests for the surf solver, and such issues will be addressable again.
 p For the time being, I just give up, sorry.
 
-p $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=surf_cpu.t:verbose
+p $ ${bindir:=.}/c-platform-failures --log=xbt_cfg.thres:critical --log=no_loc ${platfdir}/small_platform_failures.xml ${srcdir:=.}/../../s4u/platform-failures/s4u-platform-failures_d.xml --cfg=path:${srcdir} --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --log=res_cpu.t:verbose