Update tesh files of gras-pmm-sg

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9126 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/gras/pmm/test_sg_32 b/examples/gras/pmm/test_sg_32
index 393e8f2..8310b8f 100644 (file)
--- a/examples/gras/pmm/test_sg_32
+++ b/examples/gras/pmm/test_sg_32
@@ -1,38 +1,38 @@
-! output sort
-$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+! output sort 20
+$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml --log=root.fmt:[%10.6r]%e(%2i:%P@%h)%e%m%n
+> [  0.000156] ( 1:master@Jacquelin) Wait for peers for 2 sec
+> [  0.000156] ( 2:slave@Boivin) Sensor 0 starting
+> [  0.000156] ( 3:slave@Jean_Yves) Sensor 1 starting
+> [  0.000156] ( 4:slave@TeX) Sensor 2 starting
+> [  0.000156] ( 5:slave@Geoff) Sensor 3 starting
+> [  0.000156] ( 6:slave@Disney) Sensor 4 starting
+> [  0.000156] ( 7:slave@iRMX) Sensor 5 starting
+> [  0.000156] ( 8:slave@McGee) Sensor 6 starting
+> [  0.000156] ( 9:slave@Gatien) Sensor 7 starting
 > [  0.000156] (10:slave@Laroche) Sensor 8 starting
-> [  0.000156] (1:master@Jacquelin) Wait for peers for 2 sec
-> [  0.000156] (2:slave@Boivin) Sensor 0 starting
-> [  0.000156] (3:slave@Jean_Yves) Sensor 1 starting
-> [  0.000156] (4:slave@TeX) Sensor 2 starting
-> [  0.000156] (5:slave@Geoff) Sensor 3 starting
-> [  0.000156] (6:slave@Disney) Sensor 4 starting
-> [  0.000156] (7:slave@iRMX) Sensor 5 starting
-> [  0.000156] (8:slave@McGee) Sensor 6 starting
-> [  0.000156] (9:slave@Gatien) Sensor 7 starting
-> [  2.416827] (1:master@Jacquelin) Got only 2 pals (of 9). Wait 2 more seconds
-> [  4.476356] (1:master@Jacquelin) Got only 3 pals (of 9). Wait 2 more seconds
-> [  6.476356] (1:master@Jacquelin) Got only 5 pals (of 9). Wait 2 more seconds
-> [  9.355676] (1:master@Jacquelin) Got only 6 pals (of 9). Wait 2 more seconds
-> [ 12.524103] (1:master@Jacquelin) Good. Got 9 pals
-> [ 12.525507] (1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
-> [ 14.369272] (2:slave@Boivin) Receive my pos (0,0) and assignment
-> [ 15.113445] (3:slave@Jean_Yves) Receive my pos (0,1) and assignment
-> [ 16.571623] (4:slave@TeX) Receive my pos (0,2) and assignment
-> [ 16.576168] (5:slave@Geoff) Receive my pos (1,0) and assignment
-> [ 18.043128] (6:slave@Disney) Receive my pos (1,1) and assignment
-> [ 20.491553] (7:slave@iRMX) Receive my pos (1,2) and assignment
-> [ 21.206195] (8:slave@McGee) Receive my pos (2,0) and assignment
-> [ 22.231455] (9:slave@Gatien) Receive my pos (2,1) and assignment
+> [  2.416827] ( 1:master@Jacquelin) Got only 2 pals (of 9). Wait 2 more seconds
+> [  4.476356] ( 1:master@Jacquelin) Got only 3 pals (of 9). Wait 2 more seconds
+> [  6.476356] ( 1:master@Jacquelin) Got only 5 pals (of 9). Wait 2 more seconds
+> [  9.355676] ( 1:master@Jacquelin) Got only 6 pals (of 9). Wait 2 more seconds
+> [ 12.524103] ( 1:master@Jacquelin) Good. Got 9 pals
+> [ 12.525507] ( 1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
+> [ 14.369272] ( 2:slave@Boivin) Receive my pos (0,0) and assignment
+> [ 15.113445] ( 3:slave@Jean_Yves) Receive my pos (0,1) and assignment
+> [ 16.571623] ( 4:slave@TeX) Receive my pos (0,2) and assignment
+> [ 16.576168] ( 5:slave@Geoff) Receive my pos (1,0) and assignment
+> [ 18.043128] ( 6:slave@Disney) Receive my pos (1,1) and assignment
+> [ 20.491553] ( 7:slave@iRMX) Receive my pos (1,2) and assignment
+> [ 21.206195] ( 8:slave@McGee) Receive my pos (2,0) and assignment
+> [ 22.231455] ( 9:slave@Gatien) Receive my pos (2,1) and assignment
 > [ 23.679910] (10:slave@Laroche) Receive my pos (2,2) and assignment
-> [ 73.315380] (1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
-> [ 74.153996] (2:slave@Boivin) Exiting GRAS
-> [ 74.893654] (3:slave@Jean_Yves) Exiting GRAS
-> [ 76.342765] (4:slave@TeX) Exiting GRAS
-> [ 76.347189] (5:slave@Geoff) Exiting GRAS
-> [ 77.805054] (6:slave@Disney) Exiting GRAS
-> [ 80.238265] (7:slave@iRMX) Exiting GRAS
-> [ 80.948556] (8:slave@McGee) Exiting GRAS
-> [ 81.967478] (9:slave@Gatien) Exiting GRAS
-> [ 83.407037] (1:master@Jacquelin) Exiting GRAS
+> [ 73.315380] ( 1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
+> [ 74.153996] ( 2:slave@Boivin) Exiting GRAS
+> [ 74.893654] ( 3:slave@Jean_Yves) Exiting GRAS
+> [ 76.342765] ( 4:slave@TeX) Exiting GRAS
+> [ 76.347189] ( 5:slave@Geoff) Exiting GRAS
+> [ 77.805054] ( 6:slave@Disney) Exiting GRAS
+> [ 80.238265] ( 7:slave@iRMX) Exiting GRAS
+> [ 80.948556] ( 8:slave@McGee) Exiting GRAS
+> [ 81.967478] ( 9:slave@Gatien) Exiting GRAS
+> [ 83.407037] ( 1:master@Jacquelin) Exiting GRAS
 > [ 83.407037] (10:slave@Laroche) Exiting GRAS

diff --git a/examples/gras/pmm/test_sg_64 b/examples/gras/pmm/test_sg_64
index dedda62..2e95fa8 100644 (file)
--- a/examples/gras/pmm/test_sg_64
+++ b/examples/gras/pmm/test_sg_64
@@ -1,40 +1,40 @@
 #! ./tesh
 
-! output sort
-$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [  0.000156] (1:master@Jacquelin) Wait for peers for 2 sec
-> [  0.000156] (2:slave@Boivin) Sensor 0 starting
-> [  0.000156] (3:slave@Jean_Yves) Sensor 1 starting
-> [  0.000156] (4:slave@TeX) Sensor 2 starting
-> [  0.000156] (5:slave@Geoff) Sensor 3 starting
-> [  0.000156] (6:slave@Disney) Sensor 4 starting
-> [  0.000156] (7:slave@iRMX) Sensor 5 starting
-> [  0.000156] (8:slave@McGee) Sensor 6 starting
-> [  0.000156] (9:slave@Gatien) Sensor 7 starting
+! output sort 20
+$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml --log=root.fmt:[%10.6r]%e(%2i:%P@%h)%e%m%n
+> [  0.000156] ( 1:master@Jacquelin) Wait for peers for 2 sec
+> [  0.000156] ( 2:slave@Boivin) Sensor 0 starting
+> [  0.000156] ( 3:slave@Jean_Yves) Sensor 1 starting
+> [  0.000156] ( 4:slave@TeX) Sensor 2 starting
+> [  0.000156] ( 5:slave@Geoff) Sensor 3 starting
+> [  0.000156] ( 6:slave@Disney) Sensor 4 starting
+> [  0.000156] ( 7:slave@iRMX) Sensor 5 starting
+> [  0.000156] ( 8:slave@McGee) Sensor 6 starting
+> [  0.000156] ( 9:slave@Gatien) Sensor 7 starting
 > [  0.000156] (10:slave@Laroche) Sensor 8 starting
-> [  2.416827] (1:master@Jacquelin) Got only 2 pals (of 9). Wait 2 more seconds
-> [  4.476356] (1:master@Jacquelin) Got only 3 pals (of 9). Wait 2 more seconds
-> [  6.476356] (1:master@Jacquelin) Got only 5 pals (of 9). Wait 2 more seconds
-> [  9.355676] (1:master@Jacquelin) Got only 6 pals (of 9). Wait 2 more seconds
-> [ 12.524103] (1:master@Jacquelin) Good. Got 9 pals
-> [ 12.525507] (1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
-> [ 14.369401] (2:slave@Boivin) Receive my pos (0,0) and assignment
-> [ 15.113688] (3:slave@Jean_Yves) Receive my pos (0,1) and assignment
-> [ 16.572089] (4:slave@TeX) Receive my pos (0,2) and assignment
-> [ 16.576641] (5:slave@Geoff) Receive my pos (1,0) and assignment
-> [ 18.043825] (6:slave@Disney) Receive my pos (1,1) and assignment
-> [ 20.492624] (7:slave@iRMX) Receive my pos (1,2) and assignment
-> [ 21.207375] (8:slave@McGee) Receive my pos (2,0) and assignment
-> [ 22.232792] (9:slave@Gatien) Receive my pos (2,1) and assignment
+> [  2.416827] ( 1:master@Jacquelin) Got only 2 pals (of 9). Wait 2 more seconds
+> [  4.476356] ( 1:master@Jacquelin) Got only 3 pals (of 9). Wait 2 more seconds
+> [  6.476356] ( 1:master@Jacquelin) Got only 5 pals (of 9). Wait 2 more seconds
+> [  9.355676] ( 1:master@Jacquelin) Got only 6 pals (of 9). Wait 2 more seconds
+> [ 12.524103] ( 1:master@Jacquelin) Good. Got 9 pals
+> [ 12.525507] ( 1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX begin Multiplication
+> [ 14.369401] ( 2:slave@Boivin) Receive my pos (0,0) and assignment
+> [ 15.113688] ( 3:slave@Jean_Yves) Receive my pos (0,1) and assignment
+> [ 16.572089] ( 4:slave@TeX) Receive my pos (0,2) and assignment
+> [ 16.576641] ( 5:slave@Geoff) Receive my pos (1,0) and assignment
+> [ 18.043825] ( 6:slave@Disney) Receive my pos (1,1) and assignment
+> [ 20.492624] ( 7:slave@iRMX) Receive my pos (1,2) and assignment
+> [ 21.207375] ( 8:slave@McGee) Receive my pos (2,0) and assignment
+> [ 22.232792] ( 9:slave@Gatien) Receive my pos (2,1) and assignment
 > [ 23.681469] (10:slave@Laroche) Receive my pos (2,2) and assignment
-> [ 73.318369] (1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
-> [ 74.156986] (2:slave@Boivin) Exiting GRAS
-> [ 74.896643] (3:slave@Jean_Yves) Exiting GRAS
-> [ 76.345754] (4:slave@TeX) Exiting GRAS
-> [ 76.350179] (5:slave@Geoff) Exiting GRAS
-> [ 77.808044] (6:slave@Disney) Exiting GRAS
-> [ 80.241254] (7:slave@iRMX) Exiting GRAS
-> [ 80.951545] (8:slave@McGee) Exiting GRAS
-> [ 81.970467] (9:slave@Gatien) Exiting GRAS
-> [ 83.410027] (1:master@Jacquelin) Exiting GRAS
+> [ 73.318369] ( 1:master@Jacquelin) XXXXXXXXXXXXXXXXXXXXXX Ok, the result matches expectations
+> [ 74.156986] ( 2:slave@Boivin) Exiting GRAS
+> [ 74.896643] ( 3:slave@Jean_Yves) Exiting GRAS
+> [ 76.345754] ( 4:slave@TeX) Exiting GRAS
+> [ 76.350179] ( 5:slave@Geoff) Exiting GRAS
+> [ 77.808044] ( 6:slave@Disney) Exiting GRAS
+> [ 80.241254] ( 7:slave@iRMX) Exiting GRAS
+> [ 80.951545] ( 8:slave@McGee) Exiting GRAS
+> [ 81.970467] ( 9:slave@Gatien) Exiting GRAS
+> [ 83.410027] ( 1:master@Jacquelin) Exiting GRAS
 > [ 83.410027] (10:slave@Laroche) Exiting GRAS