Merge branch 'file' into 'master'

[simgrid.git] / examples / smpi / replay_multiple_manual_deploy / replay_multiple_manual_empty2.tesh

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh
index c1401f2..eb0d0a8 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh
@@ -6,7 +6,7 @@ p Workload with two empty jobs (not at the same time, not on the same resources)
 $ mkfile ${srcdir:=.}/workload_empty2
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -20,7 +20,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_0_1@Fafard) Simulation time 0.000000
 > [   0.000000] (rank_0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
 > [1000.000000] (workload@Bourassa) Launching the job executor of job 1 (app 'job1')
 > [1000.000000] (job_0001@Ginette) Executing job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
@@ -29,12 +29,12 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [1000.000000] (rank_1_1@Jupiter) Simulation time 0.000000
 > [1000.000000] (rank_1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
-> [1000.000000] (maestro@) Simulation finished! Final time: 1000
+> [1001.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
+> [1001.000000] (maestro@) Simulation finished! Final time: 1001
 
 p Workload with two empty jobs (not at the same time, not on the same resources, with noise)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -48,7 +48,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_0_1@Fafard) Simulation time 0.000000
 > [   0.000000] (rank_0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
 > [1000.000000] (workload@Bourassa) Launching the job executor of job 1 (app 'job1')
 > [1000.000000] (job_0001@Ginette) Executing job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
@@ -57,7 +57,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [1000.000000] (rank_1_1@Jupiter) Simulation time 0.000000
 > [1000.000000] (rank_1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
+> [1001.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
 > [1013.000000] (maestro@) Simulation finished! Final time: 1013
 
 $ rm -f ${srcdir:=.}/workload_empty2
@@ -70,7 +70,7 @@ p Workload with two empty jobs (not at the same time, but on the same resources)
 $ mkfile ${srcdir:=.}/workload_empty2_same_resources
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -84,7 +84,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_0_1@Fafard) Simulation time 0.000000
 > [   0.000000] (rank_0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
 > [1000.000000] (workload@Bourassa) Launching the job executor of job 1 (app 'job1')
 > [1000.000000] (job_0001@Bourassa) Executing job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
@@ -93,12 +93,12 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [1000.000000] (rank_1_1@Fafard) Simulation time 0.000000
 > [1000.000000] (rank_1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
-> [1000.000000] (maestro@) Simulation finished! Final time: 1000
+> [1001.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
+> [1001.000000] (maestro@) Simulation finished! Final time: 1001
 
 p Workload with two empty jobs (not at the same time, but on the same resources, with noise)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -112,7 +112,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_0_1@Fafard) Simulation time 0.000000
 > [   0.000000] (rank_0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
 > [1000.000000] (workload@Bourassa) Launching the job executor of job 1 (app 'job1')
 > [1000.000000] (job_0001@Bourassa) Executing job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
@@ -121,7 +121,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [1000.000000] (rank_1_1@Fafard) Simulation time 0.000000
 > [1000.000000] (rank_1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [1000.000000] (rank_1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
+> [1001.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
 > [1013.000000] (maestro@) Simulation finished! Final time: 1013
 
 $ rm -f ${srcdir:=.}/workload_empty2_same_resources
@@ -134,7 +134,7 @@ p Workload with two empty jobs (at the same time but not on the same resources)
 $ mkfile ${srcdir:=.}/workload_empty2_same_time
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -155,13 +155,13 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
-> [   0.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
-> [   0.000000] (maestro@) Simulation finished! Final time: 0
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
+> [   1.000000] (maestro@) Simulation finished! Final time: 1
 
 p Workload with two empty jobs (at the same time but not on the same resources, with noise)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -182,8 +182,8 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
-> [   0.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0001@Ginette) Finished job 1 (smpi_app 'job1')
 > [  13.000000] (maestro@) Simulation finished! Final time: 13
 
 $ rm -f ${srcdir:=.}/workload_empty2_same_time
@@ -197,7 +197,7 @@ p Workload with two empty jobs (at the same time and on the same resources)
 $ mkfile ${srcdir:=.}/workload_empty2_same_time_and_resources
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -218,14 +218,14 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
-> [   0.000000] (maestro@) Simulation finished! Final time: 0
+> [   1.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (maestro@) Simulation finished! Final time: 1
 
 p Workload with two empty jobs (at the same time and on the same resources, with noise)
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -246,8 +246,8 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [   0.000000] (rank_0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
 > [   0.000000] (rank_1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
 > [   0.000000] (rank_0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
-> [   0.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   1.000000] (job_0001@Bourassa) Finished job 1 (smpi_app 'job1')
+> [   1.000000] (job_0000@Bourassa) Finished job 0 (smpi_app 'job0')
 > [  13.000000] (maestro@) Simulation finished! Final time: 13
 
 $ rm -f ${srcdir:=.}/workload_empty2_same_time_and_resources