From 3b5330da4dc946d8f2c8a785cdcdcdcfe6f50d3d Mon Sep 17 00:00:00 2001
From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 10 Dec 2010 12:57:07 +0000
Subject: [PATCH 1/1] Update tesh files of gras-simple_token-sg

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9130 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 .../mutual_exclusion/simple_token/test_sg_32  | 23 ++++++++++---------
 .../mutual_exclusion/simple_token/test_sg_64  | 23 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)
 mode change 100755 => 100644 examples/gras/mutual_exclusion/simple_token/test_sg_32
 mode change 100755 => 100644 examples/gras/mutual_exclusion/simple_token/test_sg_64

diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_32 b/examples/gras/mutual_exclusion/simple_token/test_sg_32
old mode 100755
new mode 100644
index 365c57c67a..9a0febf007
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_32
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_32
@@ -1,11 +1,12 @@
-$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml 
-> [Tremblay:node:(1) 1.000312] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
-> [Tremblay:node:(1) 1.118273] [SimpleToken/INFO] Begin a new loop. Still to do: 2
-> [Tremblay:node:(1) 1.236234] [SimpleToken/INFO] Begin a new loop. Still to do: 1
-> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Begin a new loop. Still to do: 0
-> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops.
-> [Fafard:node:(2) 2.292537] [gras/INFO] Exiting GRAS
-> [Jupiter:node:(3) 2.320969] [gras/INFO] Exiting GRAS
-> [Ginette:node:(4) 2.333858] [gras/INFO] Exiting GRAS
-> [Bourassa:node:(5) 2.354194] [gras/INFO] Exiting GRAS
-> [Tremblay:node:(1) 2.354194] [gras/INFO] Exiting GRAS
+! output sort
+$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml  --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  1.000312] (1:node@Tremblay) Create the token (with value 0) and send it to Fafard:4000
+> [  1.118273] (1:node@Tremblay) Begin a new loop. Still to do: 2
+> [  1.236234] (1:node@Tremblay) Begin a new loop. Still to do: 1
+> [  1.354194] (1:node@Tremblay) Begin a new loop. Still to do: 0
+> [  1.354194] (1:node@Tremblay) Shut down the token-ring. There was 14 hops.
+> [  2.292537] (2:node@Fafard) Exiting GRAS
+> [  2.320969] (3:node@Jupiter) Exiting GRAS
+> [  2.333858] (4:node@Ginette) Exiting GRAS
+> [  2.354194] (1:node@Tremblay) Exiting GRAS
+> [  2.354194] (5:node@Bourassa) Exiting GRAS
diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_64 b/examples/gras/mutual_exclusion/simple_token/test_sg_64
old mode 100755
new mode 100644
index 9ff73b0eba..845d60ec0b
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_64
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_64
@@ -1,12 +1,13 @@
-$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml 
-> [Tremblay:node:(1) 1.000312] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
-> [Tremblay:node:(1) 1.118273] [SimpleToken/INFO] Begin a new loop. Still to do: 2
-> [Tremblay:node:(1) 1.236234] [SimpleToken/INFO] Begin a new loop. Still to do: 1
-> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Begin a new loop. Still to do: 0
-> [Tremblay:node:(1) 1.354194] [SimpleToken/INFO] Shut down the token-ring. There was 14 hops.
-> [Fafard:node:(2) 2.292537] [gras/INFO] Exiting GRAS
-> [Jupiter:node:(3) 2.320969] [gras/INFO] Exiting GRAS
-> [Ginette:node:(4) 2.333858] [gras/INFO] Exiting GRAS
-> [Bourassa:node:(5) 2.354194] [gras/INFO] Exiting GRAS
-> [Tremblay:node:(1) 2.354194] [gras/INFO] Exiting GRAS
+! output sort
+$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml  --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  1.000312] (1:node@Tremblay) Create the token (with value 0) and send it to Fafard:4000
+> [  1.118273] (1:node@Tremblay) Begin a new loop. Still to do: 2
+> [  1.236234] (1:node@Tremblay) Begin a new loop. Still to do: 1
+> [  1.354194] (1:node@Tremblay) Begin a new loop. Still to do: 0
+> [  1.354194] (1:node@Tremblay) Shut down the token-ring. There was 14 hops.
+> [  2.292537] (2:node@Fafard) Exiting GRAS
+> [  2.320969] (3:node@Jupiter) Exiting GRAS
+> [  2.333858] (4:node@Ginette) Exiting GRAS
+> [  2.354194] (1:node@Tremblay) Exiting GRAS
+> [  2.354194] (5:node@Bourassa) Exiting GRAS
 
-- 
2.20.1