Do not mix unix and msdos linefeeds. I've used dos2unix to fix that.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5879 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/teshsuite/simdag/basic_platform.xml b/teshsuite/simdag/basic_platform.xml
index d903e2a..79bdf98 100644 (file)
--- a/teshsuite/simdag/basic_platform.xml
+++ b/teshsuite/simdag/basic_platform.xml
@@ -1,21 +1,21 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="4e+09"/>\r
-  <host id="cpu1" power="4e+09"/>\r
-  <link id="link0" bandwidth="1.25e+08" latency="1.0e-04" sharing_policy="SHARED"/>\r
-  <route src="cpu0" dst="cpu0">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu0">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-</platform>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="4e+09"/>
+  <host id="cpu1" power="4e+09"/>
+  <link id="link0" bandwidth="1.25e+08" latency="1.0e-04" sharing_policy="SHARED"/>
+  <route src="cpu0" dst="cpu0">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu1" dst="cpu0">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu1" dst="cpu1">
+    <link:ctn id="link0"/>
+  </route>
+</platform>

diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
index 5511c99..df3e8c5 100644 (file)
--- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
+++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="1"/>
   <host id="cpu1" power="1"/>
   <host id="cpu2" power="1"/>
   <host id="cpu3" power="1"/>
@@ -14,11 +14,11 @@
   <link id="link2" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
   <link id="link3" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
   
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
     <link:ctn id="switch"/>
     <link:ctn id="link1"/>
-  </route>\r
+  </route>
 
   <route src="cpu0" dst="cpu2">
     <link:ctn id="link0"/>
@@ -85,5 +85,5 @@
     <link:ctn id="switch"/>
     <link:ctn id="link2"/>
   </route>
-  \r
-</platform>\r
+  
+</platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
index 80c810b..4ab9a4a 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
@@ -1,15 +1,15 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="1"/>
   <host id="cpu1" power="1"/>
   <link id="link0" bandwidth="1" latency=".5" sharing_policy="FATPIPE"/>
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu0">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-</platform>\r
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu1" dst="cpu0">
+    <link:ctn id="link0"/>
+  </route>
+</platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
index 67662d9..0593397 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
@@ -1,15 +1,15 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="1"/>
   <host id="cpu1" power="1"/>
   <link id="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu0">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-</platform>\r
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu1" dst="cpu0">
+    <link:ctn id="link0"/>
+  </route>
+</platform>

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
index c9e58a9..ef99e11 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
@@ -1,25 +1,25 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="1"/>
   <host id="cpu1" power="1"/>
   
   <link id="switch" bandwidth="2" latency="1" sharing_policy="FATPIPE"/>
   <link id="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
   <link id="link1" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
   
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
     <link:ctn id="switch"/>
     <link:ctn id="link1"/>
-  </route>\r
+  </route>
   
-  <route src="cpu1" dst="cpu0">\r
-    <link:ctn id="link1"/>\r
+  <route src="cpu1" dst="cpu0">
+    <link:ctn id="link1"/>
     <link:ctn id="switch"/>
     <link:ctn id="link0"/>
   </route>
-  \r
-</platform>\r
+  
+</platform>

diff --git a/teshsuite/simdag/network/platform_2p_1sl.xml b/teshsuite/simdag/network/platform_2p_1sl.xml
index 60281c6..c4ac988 100644 (file)
--- a/teshsuite/simdag/network/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/platform_2p_1sl.xml
@@ -1,18 +1,18 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="1"/>
   <host id="cpu1" power="1"/>
-  <!-- \r
+  <!-- 
   <link id="link0" bandwidth="1.25e+08" latency="2.0e-04" sharing_policy="SHARED"/>
-   -->\r
+   -->
   <link id="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu0">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-</platform>\r
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu1" dst="cpu0">
+    <link:ctn id="link0"/>
+  </route>
+</platform>

diff --git a/teshsuite/simdag/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml
index 67662d9..0593397 100644 (file)
--- a/teshsuite/simdag/partask/platform_2p_1sl.xml
+++ b/teshsuite/simdag/partask/platform_2p_1sl.xml
@@ -1,15 +1,15 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
+<platform version="2">
+
+
+  <host id="cpu0" power="1"/>
   <host id="cpu1" power="1"/>
   <link id="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <route src="cpu0" dst="cpu1">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu0">\r
-    <link:ctn id="link0"/>\r
-  </route>\r
-</platform>\r
+  <route src="cpu0" dst="cpu1">
+    <link:ctn id="link0"/>
+  </route>
+  <route src="cpu1" dst="cpu0">
+    <link:ctn id="link0"/>
+  </route>
+</platform>