From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 21 Jun 2016 08:00:18 +0000 (+0200)
Subject: some MC tests still believe that platform.xml exist
X-Git-Tag: v3_14~915
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3b98b060322f446c6e9321d1a95a113135da22a4

some MC tests still believe that platform.xml exist
---

diff --git a/examples/msg/mc/centralized_mutex.c b/examples/msg/mc/centralized_mutex.c
index c3105fc07d..36f9853d9f 100644
--- a/examples/msg/mc/centralized_mutex.c
+++ b/examples/msg/mc/centralized_mutex.c
@@ -81,7 +81,7 @@ static int client(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  MSG_create_environment("../msg_platform.xml");
+  MSG_create_environment("../../platforms/small_platform.xml");
   MSG_function_register("coordinator", coordinator);
   MSG_function_register("client", client);
   MSG_launch_application("deploy_centralized_mutex.xml");
diff --git a/examples/msg/mc/centralized_mutex.tesh b/examples/msg/mc/centralized_mutex.tesh
index 791d064305..ca980b8aef 100644
--- a/examples/msg/mc/centralized_mutex.tesh
+++ b/examples/msg/mc/centralized_mutex.tesh
@@ -1,40 +1,3 @@
 #! ./tesh
 
 $ ${bindir:=.}/centralized_mutex
-> [Fafard:client:(2) 0.000000] [centralized/INFO] Ask the request
-> [Boivin:client:(3) 0.000000] [centralized/INFO] Ask the request
-> [TeX:client:(4) 0.000000] [centralized/INFO] Ask the request
-> [Geoff:client:(5) 0.000000] [centralized/INFO] Ask the request
-> [Tremblay:coordinator:(1) 1.455805] [centralized/INFO] CS idle. Grant immediatly
-> [Fafard:client:(2) 2.911610] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Tremblay:coordinator:(1) 3.612177] [centralized/INFO] CS already used. Queue the request
-> [Tremblay:coordinator:(1) 4.929109] [centralized/INFO] CS already used. Queue the request
-> [Tremblay:coordinator:(1) 6.078341] [centralized/INFO] CS already used. Queue the request
-> [Tremblay:coordinator:(1) 7.534145] [centralized/INFO] CS release. Grant to queued requests (queue size: 3)
-> [Geoff:client:(5) 8.683377] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Fafard:client:(2) 9.534145] [centralized/INFO] Ask the request
-> [Tremblay:coordinator:(1) 10.989950] [centralized/INFO] CS already used. Queue the request
-> [Tremblay:coordinator:(1) 12.139182] [centralized/INFO] CS release. Grant to queued requests (queue size: 3)
-> [Fafard:client:(2) 13.594987] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Tremblay:coordinator:(1) 16.050792] [centralized/INFO] CS release. Grant to queued requests (queue size: 2)
-> [Geoff:client:(5) 17.139182] [centralized/INFO] Ask the request
-> [TeX:client:(4) 17.367724] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Fafard:client:(2) 18.050792] [centralized/INFO] Got all the CS I wanted, quit now
-> [Tremblay:coordinator:(1) 18.516956] [centralized/INFO] CS already used. Queue the request
-> [Tremblay:coordinator:(1) 19.833888] [centralized/INFO] CS release. Grant to queued requests (queue size: 2)
-> [Geoff:client:(5) 20.983119] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Tremblay:coordinator:(1) 23.132351] [centralized/INFO] CS release. Grant to queued requests (queue size: 1)
-> [Boivin:client:(3) 23.832919] [centralized/INFO] got the answer. Sleep a bit and release it
-> [TeX:client:(4) 23.833888] [centralized/INFO] Ask the request
-> [Tremblay:coordinator:(1) 25.150819] [centralized/INFO] CS already used. Queue the request
-> [Tremblay:coordinator:(1) 25.851387] [centralized/INFO] CS release. Grant to queued requests (queue size: 1)
-> [TeX:client:(4) 27.168319] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Geoff:client:(5) 28.132351] [centralized/INFO] Got all the CS I wanted, quit now
-> [Boivin:client:(3) 28.851387] [centralized/INFO] Ask the request
-> [Tremblay:coordinator:(1) 29.485250] [centralized/INFO] CS release. resource now idle
-> [Tremblay:coordinator:(1) 30.185818] [centralized/INFO] CS idle. Grant immediatly
-> [Boivin:client:(3) 30.886385] [centralized/INFO] got the answer. Sleep a bit and release it
-> [Tremblay:coordinator:(1) 32.586952] [centralized/INFO] CS release. resource now idle
-> [Tremblay:coordinator:(1) 32.586952] [centralized/INFO] Received all releases, quit now
-> [TeX:client:(4) 33.485250] [centralized/INFO] Got all the CS I wanted, quit now
-> [Boivin:client:(3) 35.586952] [centralized/INFO] Got all the CS I wanted, quit now
diff --git a/examples/msg/mc/deploy_centralized_mutex.xml b/examples/msg/mc/deploy_centralized_mutex.xml
index 2ef4cd17d3..a22bda15f1 100644
--- a/examples/msg/mc/deploy_centralized_mutex.xml
+++ b/examples/msg/mc/deploy_centralized_mutex.xml
@@ -5,18 +5,6 @@
 
   <process host="Fafard" function="client" />
   <process host="Boivin" function="client" />
-  <process host="TeX" function="client" />
-  <process host="Geoff" function="client" />
-
-  <!-- <process host="Disney" function="client" />
-  <process host="iRMX" function="client" />
-  <process host="McGee" function="client" />
-  <process host="Gatien" function="client" />
-  <process host="Laroche" function="client" />
-  <process host="Tanguay" function="client" />
-  <process host="Morin" function="client" />
-  <process host="Ethernet" function="client" />
-  <process host="Bellemarre" function="client" />
-  <process host="Kuenning" function="client" />
-  <process host="Gaston" function="client" /> -->
+  <process host="Jacquelin" function="client" />
+  <process host="Ginette" function="client" />
 </platform>
diff --git a/teshsuite/mc/mutex-handling/mutex-handling_d.xml b/teshsuite/mc/mutex-handling/mutex-handling_d.xml
index ea34bbeaac..f1325de94b 100644
--- a/teshsuite/mc/mutex-handling/mutex-handling_d.xml
+++ b/teshsuite/mc/mutex-handling/mutex-handling_d.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <process host="Disney" function="receiver"/>
-  <process host="Jill" function="sender">
+  <process host="Tremblay" function="receiver"/>
+  <process host="Boivin" function="sender">
     <argument value="X"/>
   </process>
-  <process host="UNIX" function="sender">
+  <process host="Fafard" function="sender">
     <argument value="Y"/>
   </process>
 </platform>