[examples] smpi-replay-mm: fix output sort

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh
index 1385602..5418215 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh
@@ -5,6 +5,7 @@ p Workload with one empty job
 $ mkfile ${srcdir:=.}/workload_empty1
 
 ! timeout 120
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --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='alone', file='empty.txt', size=2, start=0, alloc='0,1'
@@ -21,6 +22,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 
 p Workload with one empty job (with noise)
 ! timeout 120
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml  ${srcdir:=.}/workload_empty1 --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='alone', file='empty.txt', size=2, start=0, alloc='0,1'

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..9c25f51 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'
@@ -34,7 +34,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 
 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'
@@ -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'
@@ -98,7 +98,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 
 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'
@@ -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'
@@ -161,7 +161,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 
 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'
@@ -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'
@@ -225,7 +225,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 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'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh
index ba084a4..240c15c 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh
@@ -5,7 +5,7 @@ p Workload with one mixed job
 $ mkfile ${srcdir:=.}/workload_mixed1
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml  ${srcdir:=.}/workload_mixed1 --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='alone', file='mixed.txt', size=2, start=0, alloc='0,1'
@@ -21,7 +21,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml  ${srcdir
 
 p Workload with one mixed job (with noise)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml  ${srcdir:=.}/workload_mixed1 --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='alone', file='mixed.txt', size=2, start=0, alloc='0,1'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
index c228c85..000d443 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
@@ -5,7 +5,7 @@ p Workload with two mixed jobs (not at the same time, not on the same resources)
 $ mkfile ${srcdir:=.}/workload_mixed2
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --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='mixed.txt', size=2, start=0, alloc='0,1'
@@ -31,7 +31,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 
 p Workload with two mixed 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_mixed2 --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='mixed.txt', size=2, start=0, alloc='0,1'
@@ -65,7 +65,7 @@ p Workload with two mixed jobs (not at the same time, but on the same resources)
 $ mkfile ${srcdir:=.}/workload_mixed2_same_resources
 
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_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='mixed.txt', size=2, start=0, alloc='0,1'
@@ -91,7 +91,7 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 
 p Workload with two mixed 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_mixed2_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='mixed.txt', size=2, start=0, alloc='0,1'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh
index e1d5adb..e2d11c2 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh
@@ -1,6 +1,6 @@
 p Workload with two mixed jobs (at the same time but not on the same resources)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_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='mixed.txt', size=2, start=0, alloc='0,1'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh
index f9199fd..9d835d3 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh
@@ -1,6 +1,6 @@
 p Workload with two mixed jobs (at the same time but not on the same resources)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_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='mixed.txt', size=2, start=0, alloc='0,1'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh
index 5d01124..f40bf06 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh
@@ -1,6 +1,6 @@
 p Workload with two mixed jobs (at the same time and on the same resources)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_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='mixed.txt', size=2, start=0, alloc='0,1'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh
index 57311f8..b351364 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh
@@ -1,6 +1,6 @@
 p Workload with two mixed jobs (at the same time and on the same resources)
 ! timeout 120
-! output sort 19
+! output sort 25
 $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_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='mixed.txt', size=2, start=0, alloc='0,1'

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh
index d7ade0d..2556208 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh
@@ -4,13 +4,15 @@ p Workload without any job
 $ mkfile ${srcdir:=.}/workload_nojob
 
 ! timeout 120
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --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@) Simulation finished! Final time: 0
 
 ! timeout 120
+! output sort 25
 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --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'
 > [   7.000000] (maestro@) Simulation finished! Final time: 7
 
-$ rm -f ${srcdir:=.}/workload_nojob
\ No newline at end of file
+$ rm -f ${srcdir:=.}/workload_nojob