From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 18 Feb 2016 11:02:55 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_13~797
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b202abf4024ab977d86f64d5ff65094e09eb3a53?hp=0392e8f3a19e2f12d6f7dc881196572abb0213f8

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/teshsuite/java/sleep_host_off/sleep_host_off_d.xml b/teshsuite/java/sleep_host_off/sleep_host_off_d.xml
index 57937f4fa4..5394f0b14c 100644
--- a/teshsuite/java/sleep_host_off/sleep_host_off_d.xml
+++ b/teshsuite/java/sleep_host_off/sleep_host_off_d.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="sleep_host_off.SleepHostOff">
-  </process>
+  <process host="Tremblay" function="sleep_host_off.SleepHostOff"/>
 </platform>
diff --git a/teshsuite/mc/mutex_handling.xml b/teshsuite/mc/mutex_handling.xml
index 57cbaea917..7f60f93675 100644
--- a/teshsuite/mc/mutex_handling.xml
+++ b/teshsuite/mc/mutex_handling.xml
@@ -1,10 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<!-- For using with ping_pong, platform_sendrecv.xml -->
-
+  <!-- For using with ping_pong, platform_sendrecv.xml -->
   <!-- receiver my_name -->
-  <process host="Disney" function="receiver"></process>
+  <process host="Disney" function="receiver"/>
 
   <!-- sender my_name receiver_name other_sender_name -->
   <process host="Jill" function="sender">
@@ -13,5 +12,4 @@
   <process host="UNIX" function="sender">
     <argument value="Y"/>
   </process>
-
 </platform>
diff --git a/teshsuite/mc/replay/random_bug.xml b/teshsuite/mc/replay/random_bug.xml
index e2f332c0ca..d9ecb0292f 100644
--- a/teshsuite/mc/replay/random_bug.xml
+++ b/teshsuite/mc/replay/random_bug.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
-   <process host="Tremblay" function="app"/>
- </platform>
+  <process host="Tremblay" function="app"/>
+</platform>
diff --git a/teshsuite/msg/get_sender/get_sender_d.xml b/teshsuite/msg/get_sender/get_sender_d.xml
index 703b135765..2437d64f05 100644
--- a/teshsuite/msg/get_sender/get_sender_d.xml
+++ b/teshsuite/msg/get_sender/get_sender_d.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
-   <!-- Deployment -->
    <process host="Tremblay" function="send"/>
    <process host="Tremblay" function="receive"/>
- </platform>
+</platform>
diff --git a/teshsuite/msg/host_on_off/host_on_off_d.xml b/teshsuite/msg/host_on_off/host_on_off_d.xml
index 5d99c6dfa5..8ff8862c63 100644
--- a/teshsuite/msg/host_on_off/host_on_off_d.xml
+++ b/teshsuite/msg/host_on_off/host_on_off_d.xml
@@ -1,11 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="master">
-  </process>
-
-  <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Jupiter" function="slave">
-  </process>
+  <process host="Tremblay" function="master"/>
+  <process host="Jupiter" function="slave"/>
 </platform>
diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml b/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml
index 6726755c9c..a9a6559925 100644
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="test_launcher">
-  </process>
+  <process host="Tremblay" function="test_launcher"/>
 </platform>
diff --git a/teshsuite/msg/pid/pid_d.xml b/teshsuite/msg/pid/pid_d.xml
index 6456b754ce..e2ae5a4160 100644
--- a/teshsuite/msg/pid/pid_d.xml
+++ b/teshsuite/msg/pid/pid_d.xml
@@ -1,11 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
-   <!-- Deployment -->
    <process host="Tremblay" function="sendpid"/>
    <process host="Tremblay" function="sendpid"/>
    <process host="Tremblay" function="sendpid"/>
    <process host="Tremblay" function="killall"/>
- </platform>
+</platform>
diff --git a/teshsuite/msg/process/process_d.xml b/teshsuite/msg/process/process_d.xml
index cafca99a7f..2b4aabc675 100644
--- a/teshsuite/msg/process/process_d.xml
+++ b/teshsuite/msg/process/process_d.xml
@@ -1,11 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="master">
-  </process>
-
-  <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Tremblay" function="slave">
-  </process>
+  <process host="Tremblay" function="master"/>
+  <process host="Tremblay" function="slave"/>
 </platform>
diff --git a/teshsuite/msg/process_join/process_join_d.xml b/teshsuite/msg/process_join/process_join_d.xml
index e30be8aa6b..ea69ac8dc1 100644
--- a/teshsuite/msg/process_join/process_join_d.xml
+++ b/teshsuite/msg/process_join/process_join_d.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="master">
-  </process>
+  <process host="Tremblay" function="master"/>
 </platform>
diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml
index 5d99c6dfa5..8ff8862c63 100644
--- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml
+++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml
@@ -1,11 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="master">
-  </process>
-
-  <!-- The slave processes (with mailbox to listen on as argument) -->
-  <process host="Jupiter" function="slave">
-  </process>
+  <process host="Tremblay" function="master"/>
+  <process host="Jupiter" function="slave"/>
 </platform>
diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
index 92fe4c038d..57ab438eed 100644
--- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
+++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
@@ -1,57 +1,23 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
- 
- 
-   <host id="cpu0" speed="1f"/>
-   <host id="cpu1" speed="1f"/>
-   <host id="cpu2" speed="1f"/>
-   <host id="cpu3" speed="1f"/>
-   
-   <link id="switch" bandwidth="2Bps" latency="1s" sharing_policy="FATPIPE"/>
-   <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   <link id="link2" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   <link id="link3" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   
-   <route src="cpu0" dst="cpu1">
-     <link_ctn id="link0"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link1"/>
-   </route>
- 
-   <route src="cpu0" dst="cpu2">
-     <link_ctn id="link0"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link2"/>
-   </route>
- 
-   <route src="cpu0" dst="cpu3">
-     <link_ctn id="link0"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link3"/>
-   </route>
- 
-   <route src="cpu1" dst="cpu2">
-     <link_ctn id="link1"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link2"/>
-   </route>
- 
-   <route src="cpu1" dst="cpu3">
-     <link_ctn id="link1"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link3"/>
-   </route>
-   
-   <route src="cpu2" dst="cpu3">
-     <link_ctn id="link2"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link3"/>
-   </route>
- 
- </AS>
- </platform>
+  <AS id="AS0" routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
+    <host id="cpu2" speed="1f"/>
+    <host id="cpu3" speed="1f"/>
+
+    <link id="switch" bandwidth="2Bps" latency="1s" sharing_policy="FATPIPE"/>
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link2" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link3" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/><link_ctn id="switch"/><link_ctn id="link1"/></route>
+    <route src="cpu0" dst="cpu2"><link_ctn id="link0"/><link_ctn id="switch"/><link_ctn id="link2"/></route>
+    <route src="cpu0" dst="cpu3"><link_ctn id="link0"/><link_ctn id="switch"/><link_ctn id="link3"/></route>
+    <route src="cpu1" dst="cpu2"><link_ctn id="link1"/><link_ctn id="switch"/><link_ctn id="link2"/></route>
+    <route src="cpu1" dst="cpu3"><link_ctn id="link1"/><link_ctn id="switch"/><link_ctn id="link3"/></route>
+    <route src="cpu2" dst="cpu3"><link_ctn id="link2"/><link_ctn id="switch"/><link_ctn id="link3"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
index ba2146b438..ef7632ae1a 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
@@ -1,24 +1,15 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="cpu0" speed="1f" />
-   <host id="cpu1" speed="1f" />
+  <AS id="AS0" routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
 
-   <!-- 
-       large latency backbone
-       10000 because
-       20000 is MAX_TCP_WIN_SIZE
-       max bw = MAX_TCP_WIN_SIZE / ( 2 * latency )
-       which is then 1 and 1 is smallest possible
-   -->
+    <!-- large latency backbone 10000 because 20000 is MAX_TCP_WIN_SIZE
+         max bw = MAX_TCP_WIN_SIZE / ( 2 * latency ) which is then 1 and 1 is smallest possible -->
 
-   <link id="link0" bandwidth="2Bps" latency="2.777777777777777777777777778h" sharing_policy="SHARED" />
+    <link id="link0" bandwidth="2Bps" latency="2.777777777777777777777777778h" sharing_policy="SHARED"/>
 
-   <route src="cpu0" dst="cpu1">
-      <link_ctn id="link0" />
-   </route>
- </AS>
- </platform>
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
index 84860e57d9..84bf34da26 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="cpu0" speed="1f"/>
-   <host id="cpu1" speed="1f"/>
-   <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="FATPIPE"/>
-   <route src="cpu0" dst="cpu1">
-     <link_ctn id="link0"/>
-   </route>
- </AS>
- </platform>
+  <AS id="AS0" routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
+
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="FATPIPE"/>
+
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
index b437cc8b1f..53e2f8aae2 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="cpu0" speed="1f"/>
-   <host id="cpu1" speed="1f"/>
-   <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   <route src="cpu0" dst="cpu1">
-     <link_ctn id="link0"/>
-   </route>
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
+
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
index a3ca6c3cb2..bd1e546d71 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
@@ -1,20 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="cpu0" speed="1f"/>
-   <host id="cpu1" speed="1f"/>
+  <AS  id="AS0"  routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
 
-   <link id="switch" bandwidth="2Bps" latency="1s" sharing_policy="FATPIPE"/>
-   <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="switch" bandwidth="2Bps" latency="1s" sharing_policy="FATPIPE"/>
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
 
-   <route src="cpu0" dst="cpu1">
-     <link_ctn id="link0"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link1"/>
-   </route>
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/><link_ctn id="switch"/><link_ctn id="link1"/></route>
  </AS>
  </platform>
diff --git a/teshsuite/simdag/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml
index fc1d628730..771d797818 100644
--- a/teshsuite/simdag/partask/platform_2p_1sl.xml
+++ b/teshsuite/simdag/partask/platform_2p_1sl.xml
@@ -1,16 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
- 
- 
-   <host id="cpu0" speed="1f"/>
-   <host id="cpu1" speed="1f"/>
-   <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
-   <route src="cpu0" dst="cpu1">
-     <link_ctn id="link0"/>
-   </route>
- </AS>
- </platform>
+  <AS id="AS0" routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
+
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
index 2c386dec13..55805e5b32 100644
--- a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
+++ b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
@@ -1,17 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
- 
- 	<host id="cpu0" speed="1f" />
- 	<host id="cpu1" speed="2f" />
- 
- 	<link id="link0" bandwidth="1Bps" latency="500ms"
- 		sharing_policy="SHARED" />
- 	<route src="cpu0" dst="cpu1">
- 		<link_ctn id="link0" />
- 	</route>
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Full">
+    <host id="cpu0" speed="1f" />
+    <host id="cpu1" speed="2f" />
+
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED" />
+
+     <route src="cpu0" dst="cpu1"><link_ctn id="link0" /></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index 69bc2dc1a4..73140d103e 100644
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -47,12 +47,7 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_foreach.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_one_host_random.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_one_host.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_properties_foreach.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_properties_override.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_host_availability.xml
@@ -70,7 +65,6 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/random.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/route_override.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/three_hosts_non_symmetric_route.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_one_name.xml
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
index e64f4bbcc1..8e249d2c78 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
@@ -1,7 +1,3 @@
-! output sort
-$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms'
-
 ! output sort
 $ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms'
diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh
index c80744625e..26bb0d9bd1 100644
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh
+++ b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh
@@ -1,5 +1,5 @@
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Parse error at bogus_disk_attachment.xml:26: Unable to attach storage cdisk: host plouf doesn't exist.
+> [  0.000000] [0:maestro@] Parse error at bogus_disk_attachment.xml:21: Unable to attach storage cdisk: host plouf doesn't exist.
 > [  0.000000] [0:maestro@] Exiting now
diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
index 3560666d81..b7c85a241f 100644
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml
+++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
@@ -1,15 +1,11 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-
 <!-- THIS FILE IS INVALID.
 
-It declares a storage attached to a nonexistant host (plouf)
-See bogus_disk_attachment.tesh -->
-
+It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->
 
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
   <AS id="AS0" routing="Full">
-    <!-- STORAGE TYPES -->
     <storage_type id="single_HDD" model="SSD" size="4kB">
       <model_prop id="Bwrite" value="30MBps" />
       <model_prop id="Bread" value="100MBps" />
@@ -18,7 +14,6 @@ See bogus_disk_attachment.tesh -->
 
     <storage id="cdisk" typeId="single_HDD"  attach="plouf" />
 
-    <!-- HOSTS -->
     <host id="client" speed="1Gf">
       <mount storageId="cdisk" name="/sd1" />
     </host>
diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
index 19387a0397..2696ab2681 100644
--- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
@@ -2,16 +2,19 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS id="World" routing="Full">
-     <AS id="us" routing="Full">
-                <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" speed="9.27114e8f" bw="938e6Bps" lat="270us"/>
+    <AS id="us" routing="Full">
+       <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" speed="9.27114e8f"
+                bw="938e6Bps" lat="270us"/>
     </AS>
     <AS id="fr" routing="Full">
-                <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" speed="9.27114e8f" bw="938e6Bps" lat="270us"/>
+       <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" speed="9.27114e8f"
+                bw="938e6Bps" lat="270us"/>
     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
 
-    <ASroute src="us" gw_src="node-cluster_router.cluster.us" dst="fr" gw_dst="neud-grappe_router.grappe.fr" symmetrical="YES">
+    <ASroute src="us" gw_src="node-cluster_router.cluster.us" dst="fr" gw_dst="neud-grappe_router.grappe.fr"
+             symmetrical="YES">
         <link_ctn id="backbone"/>
     </ASroute>
   </AS>
diff --git a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh
index 0237bad818..c46f743e2b 100644
--- a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh
+++ b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh
@@ -1,11 +1,11 @@
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Parse error at bogus_missing_src_gateway.xml:16: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr"
+> [  0.000000] [0:maestro@] Parse error at bogus_missing_src_gateway.xml:19: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr"
 > [  0.000000] [0:maestro@] Exiting now
 
 ! expect signal SIGABRT
 $ ${bindir:=.}/flatifier bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] [0:maestro@] Parse error at bogus_missing_dst_gateway.xml:16: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr"
+> [  0.000000] [0:maestro@] Parse error at bogus_missing_dst_gateway.xml:19: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr"
 > [  0.000000] [0:maestro@] Exiting now
diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
index bfc655ce99..258965cd38 100644
--- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
+++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
@@ -3,15 +3,18 @@
 <platform version="4">
   <AS id="World" routing="Full">
      <AS id="us" routing="Full">
-                <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" speed="9.27114e8f" bw="938e6Bps" lat="270us"/>
-    </AS>
+        <cluster id="cluster" suffix=".cluster.us" prefix="node-" radical="1-4" core="24" speed="9.27114e8f"
+                 bw="938e6Bps" lat="270us"/>
+      </AS>
     <AS id="fr" routing="Full">
-                <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" speed="9.27114e8f" bw="938e6Bps" lat="270us"/>
+        <cluster id="grappe" suffix=".grappe.fr" prefix="noeud-" radical="1-4" core="24" speed="9.27114e8f"
+                 bw="938e6Bps" lat="270us"/>
     </AS>
 
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
 
-    <ASroute src="us" gw_src="nod-cluster_router.cluster.us" dst="fr" gw_dst="noeud-grappe_router.grappe.fr" symmetrical="YES">
+    <ASroute src="us" gw_src="nod-cluster_router.cluster.us" dst="fr" gw_dst="noeud-grappe_router.grappe.fr" 
+             symmetrical="YES">
         <link_ctn id="backbone"/>
     </ASroute>
   </AS>
diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml
index 3312ba1f7a..10c9d3b3c3 100644
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml
+++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml
@@ -1,29 +1,21 @@
-
 <!-- THIS FILE IS INVALID.
 
 It declares a route alice->bob and another bob->alice, both being different.
-It is used to check that this (bogus) file is detected as is (see
-two_hosts_asymetric.tesh) -->
+It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->
 
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
  <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
- 
-   <link id="link1" bandwidth="125MBps" latency="50us"/>
-   <link id="link2" bandwidth="125MBps" latency="50us"/>
-   <link id="link3" bandwidth="125MBps" latency="50us"/>
-   <link id="link4" bandwidth="125MBps" latency="50us"/>
-   
-   <route src="bob" dst="alice">
-     <link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link4"/>
-   </route>
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
 
-   <route src="alice" dst="bob">
-     <link_ctn id="link4"/><link_ctn id="link3"/><link_ctn id="link1"/>
-   </route>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+    <link id="link4" bandwidth="125MBps" latency="50us"/>
 
- </AS>
- </platform>
+   <route src="bob"   dst="alice"><link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link4"/></route>
+   <route src="alice" dst="bob">  <link_ctn id="link4"/><link_ctn id="link3"/><link_ctn id="link1"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
index 5218783dd6..83c23c3873 100644
--- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
+++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
@@ -1,27 +1,20 @@
-
 <!-- THIS FILE IS INVALID.
 
 It declares a route alice->bob and another bob->alice, both being different.
-It is used to check that this (bogus) file is detected as is (see
-two_hosts_asymetric.tesh) -->
+It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) -->
 
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
- 
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
+
    <link id="link1" bandwidth="125MBps" latency="50us"/>
    <link id="link2" bandwidth="125MBps" latency="50us"/>
-   
-   <route src="bob" dst="alice">
-     <link_ctn id="link1"/>
-   </route>
 
-   <route src="alice" dst="bob">
-     <link_ctn id="link2"/>
-   </route>
+   <route src="bob" dst="alice"><link_ctn id="link1"/></route>
 
- </AS>
- </platform>
+   <route src="alice" dst="bob"><link_ctn id="link2"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/clusterA.xml b/teshsuite/simdag/platforms/clusterA.xml
index ab96c62046..ad7bcdf747 100644
--- a/teshsuite/simdag/platforms/clusterA.xml
+++ b/teshsuite/simdag/platforms/clusterA.xml
@@ -1,5 +1,4 @@
 <AS id="ASA" routing="Full">
-  <cluster id="clusterA" prefix="A" suffix=".hamburger.edu"
-   radical="0,2-4,6" power="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us"/>
+  <cluster id="clusterA" prefix="A" suffix=".hamburger.edu" radical="0,2-4,6" power="1Gf" bw="125MBps" lat="50us"
+           bb_bw="2.25GBps" bb_lat="500us"/>
 </AS>
diff --git a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
index 6b7aa4a36c..58ca33404b 100644
--- a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
+++ b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
@@ -1,32 +1,20 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Dijkstra">
-	<host id="host1" speed="1Gf"/>
-	<host id="host2" speed="1Gf"/>
-	<host id="host3" speed="1Gf"/>
-	<host id="host4" speed="1Gf"/>
- 
-	<link id="link1" bandwidth="125GBps" latency="50us"/>
-	<link id="link2" bandwidth="125MBps" latency="5us"/>
-	<link id="link3" bandwidth="125kBps" latency="500ns"/>
-	<link id="link4" bandwidth="125Bps" latency="5ns"/>  
-	 
-   <route src="host1" dst="host2" symmetrical="NO">
-     <link_ctn id="link1"/>
-   </route>
-   <route src="host2" dst="host1" symmetrical="NO">
-     <link_ctn id="link1"/>
-   </route> 
-   
-   <route src="host1" dst="host3" symmetrical="NO">
-     <link_ctn id="link2"/>
-   </route>
-   <route src="host3" dst="host1" symmetrical="NO">
-     <link_ctn id="link2"/>
-   </route>
-   
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Dijkstra">
+    <host id="host1" speed="1Gf"/>
+    <host id="host2" speed="1Gf"/>
+    <host id="host3" speed="1Gf"/>
+    <host id="host4" speed="1Gf"/>
+
+    <link id="link1" bandwidth="125GBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="5us"/>
+    <link id="link3" bandwidth="125kBps" latency="500ns"/>
+    <link id="link4" bandwidth="125Bps" latency="5ns"/>  
+
+    <route src="host1" dst="host2" symmetrical="NO"><link_ctn id="link1"/></route>
+    <route src="host2" dst="host1" symmetrical="NO"><link_ctn id="link1"/></route> 
+    <route src="host1" dst="host3" symmetrical="NO"><link_ctn id="link2"/></route>
+    <route src="host3" dst="host1" symmetrical="NO"><link_ctn id="link2"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml
index baddb55d04..b9054e2e18 100644
--- a/teshsuite/simdag/platforms/four_hosts_floyd.xml
+++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml
@@ -1,34 +1,20 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Floyd">
-	<host id="host1" speed="1Gf"/>
-	<host id="host2" speed="1Gf"/>
-	<host id="host3" speed="1Gf"/>
-	<host id="host4" speed="1Gf"/>
- 
-	<link id="link1" bandwidth="125MBps" latency="50us"/>
-	<link id="link2" bandwidth="125MBps" latency="50us"/>
-	<link id="link3" bandwidth="125MBps" latency="50us"/>
-	<link id="link4" bandwidth="125MBps" latency="50us"/>  
-	 
-   <route src="host1" dst="host2">
-     <link_ctn id="link1"/>
-   </route>
-      
-   <route src="host1" dst="host3">
-     <link_ctn id="link2"/>
-   </route>
-   
-   <route src="host2" dst="host3">
-     <link_ctn id="link3"/>
-   </route>
-      
-   <route src="host3" dst="host4">
-     <link_ctn id="link4"/>
-   </route>
+  <AS  id="AS0"  routing="Floyd">
+    <host id="host1" speed="1Gf"/>
+    <host id="host2" speed="1Gf"/>
+    <host id="host3" speed="1Gf"/>
+    <host id="host4" speed="1Gf"/>
 
- </AS>
- </platform>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+    <link id="link4" bandwidth="125MBps" latency="50us"/>  
+
+    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
+    <route src="host1" dst="host3"><link_ctn id="link2"/></route>
+    <route src="host2" dst="host3"><link_ctn id="link3"/></route>
+    <route src="host3" dst="host4"><link_ctn id="link4"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
index f473bdf4da..c93c4e25e6 100644
--- a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
+++ b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
@@ -1,45 +1,25 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Floyd">
-	<host id="host1" speed="1Gf"/>
-	<host id="host2" speed="1Gf"/>
-	<host id="host3" speed="1Gf"/>
-	<host id="host4" speed="1Gf"/>
-	<host id="host5" speed="1Gf"/>
- 
-	<link id="link1" bandwidth="125MBps" latency="50us"/>
-	<link id="link2" bandwidth="125MBps" latency="50us"/>
-	<link id="link3" bandwidth="125MBps" latency="50us"/>
-	<link id="link4" bandwidth="125MBps" latency="50us"/>  
-	<link id="link5" bandwidth="125MBps" latency="50us"/>
-	<link id="link6" bandwidth="125MBps" latency="50us"/> 
-	 
-   <route src="host1" dst="host2">
-     <link_ctn id="link1"/>
-   </route>
-      
-   <route src="host1" dst="host3">
-     <link_ctn id="link2"/>
-   </route>
-   
-   <route src="host2" dst="host3">
-     <link_ctn id="link3"/>
-   </route>
-      
-   <route src="host3" dst="host4">
-     <link_ctn id="link4"/>
-   </route>
-   
-   <route src="host2" dst="host5">
-     <link_ctn id="link5"/>
-   </route>
-      
-   <route src="host3" dst="host5">
-     <link_ctn id="link6"/>
-   </route>
+  <AS  id="AS0"  routing="Floyd">
+    <host id="host1" speed="1Gf"/>
+    <host id="host2" speed="1Gf"/>
+    <host id="host3" speed="1Gf"/>
+    <host id="host4" speed="1Gf"/>
+    <host id="host5" speed="1Gf"/>
 
- </AS>
- </platform>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+    <link id="link4" bandwidth="125MBps" latency="50us"/>  
+    <link id="link5" bandwidth="125MBps" latency="50us"/>
+    <link id="link6" bandwidth="125MBps" latency="50us"/> 
+
+    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
+    <route src="host1" dst="host3"><link_ctn id="link2"/></route>
+    <route src="host2" dst="host3"><link_ctn id="link3"/></route>
+    <route src="host3" dst="host4"><link_ctn id="link4"/></route>
+    <route src="host2" dst="host5"><link_ctn id="link5"/></route>
+    <route src="host3" dst="host5"><link_ctn id="link6"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
index 2b91928090..bf2c664391 100644
--- a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
+++ b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
@@ -1,30 +1,19 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
+  <AS  id="AS0"  routing="Floyd">
+    <host id="host1" speed="1Gf"/>
+    <host id="host2" speed="1Gf"/>
+    <host id="host3" speed="1Gf"/>
+    <host id="host4" speed="1Gf"/>
  
- 
- <AS  id="AS0"  routing="Floyd">
-	<host id="host1" speed="1Gf"/>
-	<host id="host2" speed="1Gf"/>
-	<host id="host3" speed="1Gf"/>
-	<host id="host4" speed="1Gf"/>
- 
-	<link id="link1" bandwidth="125GBps" latency="50us"/>
-	<link id="link2" bandwidth="125MBps" latency="5us"/>
-	<link id="link3" bandwidth="125kBps" latency="500ns"/>
-	<link id="link4" bandwidth="1.25kBps" latency="5ns"/>  
-	 
-   <route src="host1" dst="host2">
-     <link_ctn id="link1"/>
-   </route>
-   
-   <route src="host2" dst="host3">
-     <link_ctn id="link3"/>
-   </route>
-      
-   <route src="host3" dst="host4">
-     <link_ctn id="link4"/>
-   </route>
+    <link id="link1" bandwidth="125GBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="5us"/>
+    <link id="link3" bandwidth="125kBps" latency="500ns"/>
+    <link id="link4" bandwidth="1.25kBps" latency="5ns"/>  
 
- </AS>
- </platform>
+    <route src="host1" dst="host2"><link_ctn id="link1"/></route>
+    <route src="host2" dst="host3"><link_ctn id="link3"/></route>
+    <route src="host3" dst="host4"><link_ctn id="link4"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml
index bc98da5d81..49a4694c0b 100644
--- a/teshsuite/simdag/platforms/one_cluster.xml
+++ b/teshsuite/simdag/platforms/one_cluster.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-   radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us"/>
+  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
+           bb_bw="2.25GBps" bb_lat="500us"/>
 </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_file.xml b/teshsuite/simdag/platforms/one_cluster_file.xml
index 9b1da8041f..5dc819040a 100644
--- a/teshsuite/simdag/platforms/one_cluster_file.xml
+++ b/teshsuite/simdag/platforms/one_cluster_file.xml
@@ -2,10 +2,8 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-   radical="0,2" speed="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us"
-   state_file="${prefix}${radical}_state_file.trace"
-   availability_file="${prefix}${radical}_availability_file.trace"/>
+  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2" speed="1Gf" bw="125MBps" lat="50us"
+           bb_bw="2.25GBps" bb_lat="500us" state_file="${prefix}${radical}_state_file.trace"
+           availability_file="${prefix}${radical}_availability_file.trace"/>
 </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_foreach.xml b/teshsuite/simdag/platforms/one_cluster_foreach.xml
deleted file mode 100644
index ee1efe1262..0000000000
--- a/teshsuite/simdag/platforms/one_cluster_foreach.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <set id="myCluster" prefix="bob" suffix=".hamburger.edu"
-        radical="0,2-4,6"/>
- 
-   <foreach set_id="myCluster">
-     <host id="$1" speed="1Gf"/>
-     <link id="$1" bandwidth="125MBps" latency="50us"/>
-   </foreach>
- 
-   <link id="bob_backbone" bandwidth="2.25GBps" latency="500us"
- 	sharing_policy="FATPIPE"/>
-  
-   <route:multi src="myCluster" dst="myCluster" symmetric="NO">
-     <link_ctn id="$src"/>
-     <link_ctn id="bob_backbone"/>
-     <link_ctn id="$dst"/>
-   </route:multi>
- </AS>
- </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml
index 0c1d189a6c..543f7f7fdf 100644
--- a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml
+++ b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml
@@ -2,9 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-   radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us"
-   sharing_policy="FULLDUPLEX"/>
+  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
+   bb_bw="2.25GBps" bb_lat="500us" sharing_policy="FULLDUPLEX"/>
 </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_multicore.xml b/teshsuite/simdag/platforms/one_cluster_multicore.xml
index 7019743258..589aa15f40 100644
--- a/teshsuite/simdag/platforms/one_cluster_multicore.xml
+++ b/teshsuite/simdag/platforms/one_cluster_multicore.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-   radical="0,2-4,6" speed="1Gf" core="6" bw="125MBps" lat="50us"/>
+  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" core="6" 
+           bw="125MBps" lat="50us"/>
 </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_one_host.xml b/teshsuite/simdag/platforms/one_cluster_one_host.xml
deleted file mode 100644
index 36e32af539..0000000000
--- a/teshsuite/simdag/platforms/one_cluster_one_host.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	   radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	   bb_bw="2.25GBps" bb_lat="500us"/>
- 
-   <host id="trudy" speed="250Mf"/>
- 
-   <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
- 
-   <route:multi src="bob_cluster" dst="trudy" symmetric="YES">
-     <link_ctn id="backbone"/>
-   </route:multi>
- </AS>
- </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml b/teshsuite/simdag/platforms/one_cluster_one_host_random.xml
deleted file mode 100644
index e1cae6d976..0000000000
--- a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <random id="myRandomGenerator" generator="DRAND48"
-	  min="1000000000" max="2000000000" mean="1600000000"
-	  std_deviation="12"/>
-
-  <set id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-       radical="0-3"/>
-
-  <host id="bob" speed="$rand(myRandomGenerator)"/>
-  
-  <foreach set_id="bob_cluster">
-    <host id="$1" speed="$rand(myRandomGenerator)"/>
-    <link id="$1" bandwidth="125MBps" latency="50us"/>
-  </foreach>
-   </AS>
- </platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml b/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml
deleted file mode 100644
index c1eee1eef0..0000000000
--- a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <set id="myCluster" prefix="bob" suffix=".hamburger.edu"
-       radical="0,2-4,6"/>
-
-  <foreach set_id="myCluster">
-    <host id="$1" speed="1Gf">
-      <prop id="cores" value="2"/>
-      <prop id="os" value="Linux"/>
-    </host>
-    <link id="$1" bandwidth="125MBps" latency="50us"/>
-  </foreach>
-</platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_properties_override.xml b/teshsuite/simdag/platforms/one_cluster_properties_override.xml
deleted file mode 100644
index 2984947608..0000000000
--- a/teshsuite/simdag/platforms/one_cluster_properties_override.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <set id="myCluster" prefix="bob" suffix=".hamburger.edu"
-       radical="0,2-4,6"/>
-
-  <foreach set_id="myCluster">
-    <host id="$1" speed="1Gf">
-      <prop id="cores" value="2"/>
-      <prop id="os" value="Linux"/>
-    </host>
-    <link id="$1" bandwidth="125MBps" latency="50us"/>
-  </foreach>
-
-  <host id="bob0.hamburger.edu" speed="1Gf">
-    <prop id="cores" value="4"/>
-  </host>
-</platform>
diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml
index 8c71e60605..5111016b42 100644
--- a/teshsuite/simdag/platforms/one_cluster_router_id.xml
+++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <AS id="AS0" routing="Full">
-  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-   radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
-   bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
+  <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0,2-4,6" speed="1Gf" bw="125MBps" lat="50us"
+           bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
 </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml
index dd3b87f6e4..9d07959756 100644
--- a/teshsuite/simdag/platforms/one_host.xml
+++ b/teshsuite/simdag/platforms/one_host.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"/>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf"/>
   </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml
index 221276b212..7845c7dbfa 100644
--- a/teshsuite/simdag/platforms/one_host_availability.xml
+++ b/teshsuite/simdag/platforms/one_host_availability.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"
-        availability_file="bob.trace"/>
-		</AS>
+<AS  id="AS0"  routing="Full">
+  <host id="bob" speed="500Mf" availability_file="bob.trace"/>
+</AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_properties.xml b/teshsuite/simdag/platforms/one_host_properties.xml
index 89b2fe23d7..3691ccd8ef 100644
--- a/teshsuite/simdag/platforms/one_host_properties.xml
+++ b/teshsuite/simdag/platforms/one_host_properties.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
+<AS  id="AS0"  routing="Full">
   <host id="bob" speed="1Gf">
     <prop id="memory" value="1000000000"/>
     <prop id="disk" value="80E9"/>
     <prop id="OS" value="Linux 2.6.22-14"/>
   </host>
-  </AS>
+</AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml
index 6a2ae11264..b2402d93d3 100644
--- a/teshsuite/simdag/platforms/one_host_state_file.xml
+++ b/teshsuite/simdag/platforms/one_host_state_file.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"
-        state_file="bob.fail"/>
-		</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf" state_file="bob.fail"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_state_off.xml b/teshsuite/simdag/platforms/one_host_state_off.xml
index 447b656117..07aa26be76 100644
--- a/teshsuite/simdag/platforms/one_host_state_off.xml
+++ b/teshsuite/simdag/platforms/one_host_state_off.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"
-        state="OFF"/>
-		</AS>
+  <AS  id="AS0"  routing="Full">
+     <host id="bob" speed="500Mf" state="OFF"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_state_on.xml b/teshsuite/simdag/platforms/one_host_state_on.xml
index 2b94e24ff4..115e742eec 100644
--- a/teshsuite/simdag/platforms/one_host_state_on.xml
+++ b/teshsuite/simdag/platforms/one_host_state_on.xml
@@ -1,8 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"
-        state="ON"/>
-		</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf" state="ON"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_trace_file.xml b/teshsuite/simdag/platforms/one_host_trace_file.xml
index 3b5f62dc33..081295ef37 100644
--- a/teshsuite/simdag/platforms/one_host_trace_file.xml
+++ b/teshsuite/simdag/platforms/one_host_trace_file.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="bob" speed="1Gf"/>  
-</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>  
+  </AS>
   <trace id="myTrace" file="bob.trace" periodicity="1.0"/>
   <trace_connect trace="myTrace" element="bob" kind="SPEED"/>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_host_trace_inside.xml b/teshsuite/simdag/platforms/one_host_trace_inside.xml
index ac92ef50a3..b558d30471 100644
--- a/teshsuite/simdag/platforms/one_host_trace_inside.xml
+++ b/teshsuite/simdag/platforms/one_host_trace_inside.xml
@@ -3,7 +3,7 @@
 <platform version="4">
 <AS  id="AS0"  routing="Full">
   <host id="bob" speed="1Gf"/>
-</AS>  
+</AS>
   <trace id="myTrace" periodicity="1.0">
     0.0 1.0
     11.0 0.5
@@ -11,5 +11,4 @@
   </trace>
 
   <trace_connect trace="myTrace" element="bob" kind="SPEED"/>
-
 </platform>
diff --git a/teshsuite/simdag/platforms/one_link_availability.xml b/teshsuite/simdag/platforms/one_link_availability.xml
index 32ec7705d0..85dd598c70 100644
--- a/teshsuite/simdag/platforms/one_link_availability.xml
+++ b/teshsuite/simdag/platforms/one_link_availability.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
+<AS  id="AS0"  routing="Full">
   <host id="bob" speed="500Mf"/>
-  <link id="link1" bandwidth="80MBps" latency="100us"
-        bandwidth_file="link1.bw" latency_file="link1.lat"/>
-		</AS>
+  <link id="link1" bandwidth="80MBps" latency="100us" bandwidth_file="link1.bw" latency_file="link1.lat"/>
+</AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml
index c9ca8f2c1f..103a5401f5 100644
--- a/teshsuite/simdag/platforms/one_link_fatpipe.xml
+++ b/teshsuite/simdag/platforms/one_link_fatpipe.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"/>
-  <link id="link1" bandwidth="125MBps" latency="50us"
-        sharing_policy="FATPIPE"/>
-		</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf"/>
+    <link id="link1" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml
index a13f343f6b..1b427f0a1a 100644
--- a/teshsuite/simdag/platforms/one_link_shared.xml
+++ b/teshsuite/simdag/platforms/one_link_shared.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"/>
-  <link id="link1" bandwidth="125MBps" latency="50us"/>
-</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf"/>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/one_link_state_file.xml b/teshsuite/simdag/platforms/one_link_state_file.xml
index dc50e88346..7eeea58056 100644
--- a/teshsuite/simdag/platforms/one_link_state_file.xml
+++ b/teshsuite/simdag/platforms/one_link_state_file.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	 <AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf"/>
-  <link id="link1" bandwidth="80MBps" latency="100us"
-        state_file="link1.fail"/>
-		</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="500Mf"/>
+    <link id="link1" bandwidth="80MBps" latency="100us" state_file="link1.fail"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/platform_include.xml b/teshsuite/simdag/platforms/platform_include.xml
index 326429e86f..1c172ee265 100644
--- a/teshsuite/simdag/platforms/platform_include.xml
+++ b/teshsuite/simdag/platforms/platform_include.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	<AS id="main" routing="Full">
-		<include file="clusterA.xml"></include>
-		<include file="clusterB.xml"></include>
-	</AS>
+  <AS id="main" routing="Full">
+    <include file="clusterA.xml"></include>
+    <include file="clusterB.xml"></include>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml
index 17c9151f84..a15bf7a113 100644
--- a/teshsuite/simdag/platforms/properties.xml
+++ b/teshsuite/simdag/platforms/properties.xml
@@ -1,16 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-	
-<config id="General">
-	<prop id="maxmin/precision" value="0.000010"></prop>
-	<prop id="cpu/optim" value="TI"></prop>
-	<prop id="host/model" value="compound"></prop>
-	<prop id="network/model" value="Vegas"></prop>
-	<prop id="path" value="~/"></prop>
-</config>
-	
-<AS  id="AS0"  routing="Full">
-	<host id="bob" speed="500Mf"/>
-</AS>
+  <config id="General">
+    <prop id="maxmin/precision" value="0.000010"></prop>
+    <prop id="cpu/optim" value="TI"></prop>
+    <prop id="host/model" value="compound"></prop>
+    <prop id="network/model" value="Vegas"></prop>
+    <prop id="path" value="~/"></prop>
+  </config>
+  <AS  id="AS0"  routing="Full">
+     <host id="bob" speed="500Mf"/>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/random.xml b/teshsuite/simdag/platforms/random.xml
index 56ef909b6d..573c4246f3 100644
--- a/teshsuite/simdag/platforms/random.xml
+++ b/teshsuite/simdag/platforms/random.xml
@@ -26,40 +26,27 @@
 
 <!--  tentative de description de variables linéairement corrélées. À revoir et confirmer... -->
 <random_law_type id="white" type="Gaussion" mean="1000" max="10000"/>
-<random_core_and_power_type 
-id_core="foo" 
-id_power="Core2010" 
-mode="linear" base="NBcore" linear_a="0.5" linear_b="1000" noise="white"/>
+<random_core_and_power_type id_core="foo"id_power="Core2010" mode="linear" base="NBcore" 
+                            linear_a="0.5" linear_b="1000" noise="white"/>
 
 <AS  id="AS0"  routing="Full">
   <!-- Horizontal streams -->
   <host id="foo" speed="123.121kf" state_trace="mystate" availability_trace="mypow_avail"/> 
   <link id="bar" bandwidth=""   bandwidth_trace="mybw" latency_trace="mylat"/>
-  <cluster  id="bob_cluster"
-        prefix="bob"
-        suffix=".hamburger.edu"
-        radical="0-1"
-        speed="100kf"
-        bw=""
-        lat="50us"
-        bb_bw="2.25GBps"
-        bb_lat="500us"
+  <cluster  id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="100kf"
+        bw="" lat="50us" bb_bw="2.25GBps"  bb_lat="500us"
         bw_trace="mybw"
         availability_trace="mywpow_avail"
         state_trace="mystate"
-        />
-        
+   />
+
   <!-- Vertical stream ? -->
-  <peer_set id="peer_home"
-        prefix="home"
-        suffix=".edu"
-        radical="1-10000"
+  <peer_set id="peer_home" prefix="home" suffix=".edu" radical="1-10000"
         speed="CustomPower"
         bw_in_trace="mybw"
         bw_out="CustomBWval"
         lat="50us"
-        />
-   <peer_set 
-     />
-</AS>	
+  />
+  <peer_set/>
+</AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/route_override.xml b/teshsuite/simdag/platforms/route_override.xml
deleted file mode 100644
index 69495eae2d..0000000000
--- a/teshsuite/simdag/platforms/route_override.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	   radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	   bb_bw="2.25GBps" bb_lat="500us"/>
- 
-   <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr"
- 	   radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	   bb_bw="2.25GBps" bb_lat="500us"/>
- 
-   <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
- 
-   <route:multi src="bob_cluster" dst="alice_cluster" symmetric="YES">
-     <link_ctn id="backbone"/>
-     <link_ctn id="$dst"/>
-   </route:multi>
- 
-   <route:multi src="bob0.hamburger.edu" dst="$*" action="OVERRIDE" symmetric="NO">
-     <link_ctn id="$src"/>
-     <link_ctn id="backbone"/>
-     <link_ctn id="$dst"/>
-   </route:multi>
- 
-   <route:multi src="bob0.hamburger.edu" dst="bob_cluster" action="OVERRIDE" symmetric="NO">
-     <link_ctn id="$src"/>
-     <link_ctn id="bob_cluster_bb"/>
-     <link_ctn id="$dst"/>
-   </route:multi>
- 
- </AS>
- </platform>
diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml
index 9468a28c41..3f5d239c2a 100644
--- a/teshsuite/simdag/platforms/test_of_is_router.xml
+++ b/teshsuite/simdag/platforms/test_of_is_router.xml
@@ -1,33 +1,31 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS  id="AS"  routing="Full">
-	
-	<AS  id="AS0"  routing="Full">
-	   <host id="host01" speed="1Gf"/>
-	   <host id="host02" speed="500Mf"/>
-	   <router id="router1"/>
-	</AS>
-	<AS  id="AS1"  routing="Floyd">
-	   <host id="host03" speed="1Gf"/>
-	   <host id="host04" speed="500Mf"/>
-	   <router id="router2"/>
-	</AS>
-	<AS  id="AS2"  routing="Dijkstra">
-	   <host id="host05" speed="1Gf"/>
-	   <host id="host06" speed="500Mf"/>
-	   <router id="router3"/>
-	   </AS>
-	<AS  id="AS3"  routing="DijkstraCache">
-	   <host id="host07" speed="1Gf"/>
-	   <host id="host08" speed="500Mf"/>
-	   <router id="router4"/>
-	</AS>
-	<AS  id="AS4"  routing="None">
-	   <host id="host09" speed="1Gf"/>
-	   <host id="host10" speed="500Mf"/>
-	   <router id="router5"/>
-	</AS>
-	
-</AS>
+  <AS  id="AS"  routing="Full">
+    <AS  id="AS0"  routing="Full">
+       <host id="host01" speed="1Gf"/>
+       <host id="host02" speed="500Mf"/>
+       <router id="router1"/>
+    </AS>
+    <AS  id="AS1"  routing="Floyd">
+       <host id="host03" speed="1Gf"/>
+       <host id="host04" speed="500Mf"/>
+       <router id="router2"/>
+    </AS>
+    <AS  id="AS2"  routing="Dijkstra">
+       <host id="host05" speed="1Gf"/>
+       <host id="host06" speed="500Mf"/>
+       <router id="router3"/>
+    </AS>
+   <AS  id="AS3"  routing="DijkstraCache">
+       <host id="host07" speed="1Gf"/>
+       <host id="host08" speed="500Mf"/>
+       <router id="router4"/>
+   </AS>
+   <AS  id="AS4"  routing="None">
+       <host id="host09" speed="1Gf"/>
+       <host id="host10" speed="500Mf"/>
+       <router id="router5"/>
+   </AS>
+  </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
index 8e1428a5ff..e4e0706fd8 100644
--- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
+++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
@@ -1,31 +1,18 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
-   <host id="trudy" speed="250Mf"/>
- 
-   <link id="link1" bandwidth="125MBps" latency="50us"/>
-   <link id="link2" bandwidth="125MBps" latency="50us"/>
-   <link id="link3" bandwidth="125MBps" latency="50us"/>
- 
-   <route src="bob" dst="alice" symmetrical="NO">
-     <link_ctn id="link1"/>
-   </route>
-   <route src="alice" dst="bob" symmetrical="NO">
-     <link_ctn id="link2"/>
-     <link_ctn id="link3"/>
-   </route>
- 
-   <route src="bob" dst="trudy">
-     <link_ctn id="link2"/>
-   </route>
- 
-   <route src="trudy" dst="alice">
-     <link_ctn id="link3"/>
-   </route>
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
+    <host id="trudy" speed="250Mf"/>
+
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+
+   <route src="bob" dst="alice" symmetrical="NO"><link_ctn id="link1"/></route>
+   <route src="alice" dst="bob" symmetrical="NO"><link_ctn id="link2"/><link_ctn id="link3"/></route>
+   <route src="bob" dst="trudy"><link_ctn id="link2"/></route>
+   <route src="trudy" dst="alice"><link_ctn id="link3"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml
index 30d27301e2..e40b830587 100644
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -1,26 +1,17 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
-	
- <AS  id="AS0"  routing="Full">
-   	
-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	    radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us"/>
-   
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr"
- 	    radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us"/>  
-       
+  <AS  id="AS0"  routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>
+    <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>  
+
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
- 	
-     <ASroute src="bob_cluster" dst="alice_cluster" 
-	 gw_src="bobbob_cluster_router.hamburger.edu" 
-	 gw_dst="alicealice_cluster_router.crepe.fr">
- 		<link_ctn id="backbone"/>
+
+     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bobbob_cluster_router.hamburger.edu" 
+              gw_dst="alicealice_cluster_router.crepe.fr">
+        <link_ctn id="backbone"/>
      </ASroute>
-     
- </AS>
- </platform>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml
index 92b381cad5..0625fd317f 100644
--- a/teshsuite/simdag/platforms/two_clusters_one_name.xml
+++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml
@@ -2,23 +2,17 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <AS id="AS0"  routing="Full">
-
-    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
-             radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
              bb_bw="2.25GBps" bb_lat="500us"/>
-   
-    <cluster id="bob_cluster_1" prefix="bob" suffix=".hamburger.edu"
-             radical="2-3" speed="1Gf" bw="125MBps" lat="50us"
+
+    <cluster id="bob_cluster_1" prefix="bob" suffix=".hamburger.edu" radical="2-3" speed="1Gf" bw="125MBps" lat="50us"
              bb_bw="2.25GBps" bb_lat="500us"/>
-	    
+
     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
-   
-    <ASroute src="bob_cluster" 
-             dst="bob_cluster_1" 
-             gw_src="bobbob_cluster_router.hamburger.edu" 
+
+    <ASroute src="bob_cluster" dst="bob_cluster_1" gw_src="bobbob_cluster_router.hamburger.edu" 
              gw_dst="bobbob_cluster_1_router.hamburger.edu">
       <link_ctn id="backbone"/>
-    </ASroute>  
-    
+    </ASroute>
   </AS>
 </platform>
diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml
index f5559a1e7b..7c0e117883 100644
--- a/teshsuite/simdag/platforms/two_clusters_router_id.xml
+++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml
@@ -1,32 +1,19 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
-	
- <AS  id="AS0"  routing="Full">
-   	
-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	    radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
-   
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr"
- 	    radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
-       
+  <AS  id="AS0"  routing="Full">
+     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+              bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
+     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+              bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
+
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
- 	
-     <ASroute src="bob_cluster" dst="alice_cluster" 
-	 gw_src="bob_cluster_router" 
-	 gw_dst="alice_cluster_router">
- 		<link_ctn id="backbone"/>
+
+     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
+        <link_ctn id="backbone"/>
      </ASroute>
-	 
-     <ASroute src="alice_cluster" dst="bob_cluster" 
-	 gw_src="alice_cluster_router" 
-	 gw_dst="bob_cluster_router">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
-     
- </AS>
- </platform>
+     <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
+        <link_ctn id="backbone"/>
+     </ASroute>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/two_clusters_symmetric.xml b/teshsuite/simdag/platforms/two_clusters_symmetric.xml
index 4f29322845..9afb8cfc7a 100644
--- a/teshsuite/simdag/platforms/two_clusters_symmetric.xml
+++ b/teshsuite/simdag/platforms/two_clusters_symmetric.xml
@@ -1,26 +1,18 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 	
- <AS  id="AS0"  routing="Full">
-   	
-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	    radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us"/>
-   
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr"
- 	    radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us"/>  
-       
+  <AS  id="AS0"  routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>
+    <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>  
+
      <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
- 	
-     <ASroute src="bob_cluster" dst="alice_cluster" 
-	 gw_src="bobbob_cluster_router.hamburger.edu" 
-	 gw_dst="alicealice_cluster_router.crepe.fr"
-	 symmetrical="YES">
- 		<link_ctn id="backbone"/>
-     </ASroute>        
- </AS>
- </platform>
+
+     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bobbob_cluster_router.hamburger.edu" 
+              gw_dst="alicealice_cluster_router.crepe.fr" symmetrical="YES">
+        <link_ctn id="backbone"/>
+     </ASroute>
+  </AS>
+</platform>
 
diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
index 63baa3acdd..5048e04023 100644
--- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
+++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
@@ -1,21 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
- 
-   <link id="link_bob" bandwidth="125MBps" latency="50us"/>
-   <link id="link_alice" bandwidth="125MBps" latency="50us"/>
-   <link id="switch" bandwidth="125MBps" latency="50us"
-         sharing_policy="FATPIPE"/>
- 
-   <route src="bob" dst="alice">
-     <link_ctn id="link_bob"/>
-     <link_ctn id="switch"/>
-     <link_ctn id="link_alice"/>
-   </route>
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
+
+    <link id="link_bob" bandwidth="125MBps" latency="50us"/>
+    <link id="link_alice" bandwidth="125MBps" latency="50us"/>
+    <link id="switch" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
+
+    <route src="bob" dst="alice"><link_ctn id="link_bob"/><link_ctn id="switch"/><link_ctn id="link_alice"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml
index ad75daf054..6140f0ba91 100644
--- a/teshsuite/simdag/platforms/two_hosts_one_link.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml
@@ -1,16 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
- 
-   <link id="link1" bandwidth="125MBps" latency="50us"/>
-   
-   <route src="bob" dst="alice">
-     <link_ctn id="link1"/>
-   </route>
- </AS>
- </platform>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
+
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+
+    <route src="bob" dst="alice"><link_ctn id="link1"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
index 5e7912a991..25c944cce6 100644
--- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
@@ -1,22 +1,13 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
- 
-   <link id="link1" bandwidth="125MBps" latency="50us"
-   sharing_policy="FULLDUPLEX"/>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
 
-   <route src="alice" dst="bob" symmetrical="NO">
-     <link_ctn id="link1" direction="UP"/>
-   </route>
- 
-   <route src="bob" dst="alice" symmetrical="NO">
-     <link_ctn id="link1" direction="DOWN"/>
-   </route>
+    <link id="link1" bandwidth="125MBps" latency="50us" sharing_policy="FULLDUPLEX"/>
 
- </AS>
- </platform>
+    <route src="alice" dst="bob" symmetrical="NO"><link_ctn id="link1" direction="UP"/></route>
+    <route src="bob" dst="alice" symmetrical="NO"><link_ctn id="link1" direction="DOWN"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
index f4fdd24b63..a0c5550fb3 100644
--- a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
+++ b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
@@ -1,21 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
- 
- 
- <AS  id="AS0"  routing="Full">
-   <host id="bob" speed="1Gf"/>
-   <host id="alice" speed="500Mf"/>
- 
-   <link id="link1" bandwidth="125MBps" latency="50us"/>
-   <link id="link2" bandwidth="125MBps" latency="50us"/>
-   <link id="link3" bandwidth="125MBps" latency="50us"/>
-   
-   <route src="bob" dst="alice" symmetrical="YES">
-     <link_ctn id="link1"/>
-	 <link_ctn id="link2"/>
-	 <link_ctn id="link3"/>
-   </route>
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
 
- </AS>
- </platform>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+
+    <route src="bob" dst="alice" symmetrical="YES"><link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link3"/></route>
+  </AS>
+</platform>
diff --git a/teshsuite/simix/stack_overflow/stack_overflow.xml b/teshsuite/simix/stack_overflow/stack_overflow.xml
index 65b93e4952..ea69ac8dc1 100644
--- a/teshsuite/simix/stack_overflow/stack_overflow.xml
+++ b/teshsuite/simix/stack_overflow/stack_overflow.xml
@@ -1,9 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-
-  <!-- The master process (with some arguments) -->
-  <process host="Tremblay" function="master">
-  </process>
-
+  <process host="Tremblay" function="master"/>
 </platform>
diff --git a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml b/teshsuite/simix/stack_overflow/stack_overflow_platform.xml
index 2ea65afed0..72c5c0587c 100644
--- a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml
+++ b/teshsuite/simix/stack_overflow/stack_overflow_platform.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-
-  <!-- The hosts -->
   <AS  id="AS0"  routing="Full">
    <host id="Tremblay" speed="98.095Mf"/>
   </AS>
-
 </platform>
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 2f47778443..e48cf7904f 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -764,12 +764,14 @@ endif()
 ### Simgrid Lib sources
 set(simgrid_sources
   ${BINDINGS_SRC}
-  ${S4U_SRC}
+  ${MC_SRC_BASE}
   ${MSG_SRC}
+  ${S4U_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
+  ${TRACING_SRC}
   ${XBT_SRC}
   )
 
@@ -792,16 +794,6 @@ if(enable_smpi)
     )
 endif()
 
-set(simgrid_sources
-    ${simgrid_sources}
-    ${TRACING_SRC}
-    )
-
-set(simgrid_sources
-  ${simgrid_sources}
-  ${MC_SRC_BASE}
-  )
-
 if(HAVE_MC)
   set(simgrid_sources
     ${simgrid_sources}