From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Mon, 14 May 2012 15:19:37 +0000 (+0200)
Subject: Fix platform file for mutual exclusion example. Fix the associated test
X-Git-Tag: v3_9_90~569^2~19^2~80
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/12fdd5a6725a42b1c3baf51e9927462ae5b6db44

Fix platform file for mutual exclusion example. Fix the associated test
---

diff --git a/examples/mutualExclusion/mutualexclusion.tesh b/examples/mutualExclusion/mutualexclusion.tesh
index a4e4ec880d..e4aaa551b3 100644
--- a/examples/mutualExclusion/mutualexclusion.tesh
+++ b/examples/mutualExclusion/mutualexclusion.tesh
@@ -3,9 +3,6 @@
 ! output sort
 
 $ java -cp .:${srcdir:=.}/examples:${srcdir:=.}/simgrid.jar mutualExclusion/centralized/MutexCentral ${srcdir:=.}/examples/mutualExclusion/ring3.xml ${srcdir:=.}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
-> [0.000000] /home/navarro/workspace/simgrid/src/surf/surfxml_parse.c:40: [surf_parse/WARNING] /home/navarro/workspace/simgrid-java/examples/mutualExclusion/ring3.xml:23: Ignoring the identical redefinition of the route between "Host 1" and "Host 0"
-> [0.000000] /home/navarro/workspace/simgrid/src/surf/surfxml_parse.c:40: [surf_parse/WARNING] /home/navarro/workspace/simgrid-java/examples/mutualExclusion/ring3.xml:31: Ignoring the identical redefinition of the route between "Host 2" and "Host 0"
-> [0.000000] /home/navarro/workspace/simgrid/src/surf/surfxml_parse.c:40: [surf_parse/WARNING] /home/navarro/workspace/simgrid-java/examples/mutualExclusion/ring3.xml:35: Ignoring the identical redefinition of the route between "Host 2" and "Host 1"
 > [0.000000] [jmsg/INFO] Ready to run MSG_MAIN
 > [0.007806] [jmsg/INFO] Done running MSG_MAIN
 > [0.007806] [jmsg/INFO] MSG_main finished
diff --git a/examples/mutualExclusion/ring3.xml b/examples/mutualExclusion/ring3.xml
index 8a18819908..db3a300884 100644
--- a/examples/mutualExclusion/ring3.xml
+++ b/examples/mutualExclusion/ring3.xml
@@ -18,21 +18,10 @@
     <link_ctn id="l1"/>
   </route>
 
-  <route src="Host 1" dst="Host 0">
-    <link_ctn id="l0"/>
-  </route>
-
   <route src="Host 1" dst="Host 2">
     <link_ctn id="l2"/>
   </route>
 
-  <route src="Host 2" dst="Host 0">
-    <link_ctn id="l1"/>
-  </route>
-
-  <route src="Host 2" dst="Host 1">
-    <link_ctn id="l2"/>
-  </route>
 </AS>
 </platform>