X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c00b5656566487f784e3dda308866852f4df5d43..e53420bc5ff10f8df9481033265fc04005b88ebc:/examples/msg/token_ring/token_ring.tesh

diff --git a/examples/msg/token_ring/token_ring.tesh b/examples/msg/token_ring/token_ring.tesh
index 2e221f3cc6..02147a9906 100644
--- a/examples/msg/token_ring/token_ring.tesh
+++ b/examples/msg/token_ring/token_ring.tesh
@@ -1,34 +1,36 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV token_ring ${srcdir:=.}/two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n 
+! output sort
+$ $SG_TEST_EXENV ${bindir:=.}/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] (2:slave@alice4.crepe.fr) Received "Token"
-> [  1.066240] (1:master@alice1.crepe.fr) Send Data to "host1"
-> [  1.132480] (3:slave@alice0.crepe.fr) Received "Token"
-> [  1.132480] (2:slave@alice4.crepe.fr) Send Data to "host2"
-> [  2.320160] (4:slave@bob4.hamburger.edu) Received "Token"
-> [  2.320160] (3:slave@alice0.crepe.fr) Send Data to "host3"
-> [  3.386400] (5:slave@bob2.hamburger.edu) Received "Token"
-> [  3.386400] (4:slave@bob4.hamburger.edu) Send Data to "host4"
-> [  4.452640] (6:slave@bob0.hamburger.edu) Received "Token"
-> [  4.452640] (5:slave@bob2.hamburger.edu) Send Data to "host5"
-> [  5.640320] (7:slave@alice3.crepe.fr) Received "Token"
-> [  5.640320] (6:slave@bob0.hamburger.edu) Send Data to "host6"
-> [  6.706560] (8:slave@alice2.crepe.fr) Received "Token"
-> [  6.706560] (7:slave@alice3.crepe.fr) Send Data to "host7"
-> [  7.894240] (9:slave@bob3.hamburger.edu) Received "Token"
-> [  7.894240] (8:slave@alice2.crepe.fr) Send Data to "host8"
-> [  8.960480] (10:slave@bob1.hamburger.edu) Received "Token"
-> [  8.960480] (9:slave@bob3.hamburger.edu) Send Data to "host9"
-> [ 10.148160] (1:master@alice1.crepe.fr) Received "Token"
-> [ 10.148160] (10:slave@bob1.hamburger.edu) Send Data to "host0"
-> [ 10.148160] (0:@) Simulation time 10.1482
+> [  0.066240] (1:master@bob1.hamburger.edu) Send Data to "host1"
+> [  0.066240] (2:slave@bob3.hamburger.edu) Received "Token"
+> [  0.242880] (2:slave@bob3.hamburger.edu) Send Data to "host2"
+> [  0.242880] (3:slave@alice2.crepe.fr) Received "Token"
+> [  0.309120] (3:slave@alice2.crepe.fr) Send Data to "host3"
+> [  0.309120] (4:slave@alice3.crepe.fr) Received "Token"
+> [  0.485760] (4:slave@alice3.crepe.fr) Send Data to "host4"
+> [  0.485760] (5:slave@bob0.hamburger.edu) Received "Token"
+> [  0.552000] (5:slave@bob0.hamburger.edu) Send Data to "host5"
+> [  0.552000] (6:slave@bob2.hamburger.edu) Received "Token"
+> [  0.618240] (6:slave@bob2.hamburger.edu) Send Data to "host6"
+> [  0.618240] (7:slave@bob4.hamburger.edu) Received "Token"
+> [  0.794880] (7:slave@bob4.hamburger.edu) Send Data to "host7"
+> [  0.794880] (8:slave@alice0.crepe.fr) Received "Token"
+> [  0.861120] (8:slave@alice0.crepe.fr) Send Data to "host8"
+> [  0.861120] (9:slave@alice4.crepe.fr) Received "Token"
+> [  0.927360] (10:slave@alice1.crepe.fr) Received "Token"
+> [  0.927360] (9:slave@alice4.crepe.fr) Send Data to "host9"
+> [  1.104000] (0:@) Simulation time 1.104
+> [  1.104000] (10:slave@alice1.crepe.fr) Send Data to "host0"
+> [  1.104000] (1:master@bob1.hamburger.edu) Received "Token"
 
-
-$ $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] [2:slave@peer_100030591] Received "Token"
-> [5112.488529] [1:master@peer_100036570] Send Data to "host1"
-> [10223.977057] [1:master@peer_100036570] Received "Token"
-> [10223.977057] [2:slave@peer_100030591] Send Data to "host0"
-> [10223.977057] [0:@] Simulation time 10224
+! output sort
+$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+> [    0.000000] (0:@) Configuration change: Set 'coordinates' to 'yes'
+> [    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.
+> [    5.221778] (1:master@peer_100030591) Send Data to "host1"
+> [    5.221778] (2:slave@peer_100036570) Received "Token"
+> [   10.443556] (0:@) Simulation time 10.4436
+> [   10.443556] (1:master@peer_100030591) Received "Token"
+> [   10.443556] (2:slave@peer_100036570) Send Data to "host0"
\ No newline at end of file