From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 24 Feb 2016 11:44:54 +0000 (+0100)
Subject: four_hosts_floyd_bis doesn't bring anything
X-Git-Tag: v3_13~703
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4798786432abd9d5cb7231e354c5dd34fa1c068c?ds=sidebyside

four_hosts_floyd_bis doesn't bring anything
  when compared to four_hosts_floyd
  kill it and remove associate test
  and it had 5 hosts BTW ... logical in a SimGrid way.
---

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index 7174dd628d..34ec88cca1 100644
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -27,7 +27,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijkstra_ns3.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_bis.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_ns3.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml
diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index d95e69d78a..76cc76f082 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -64,10 +64,6 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 4, link number: 5
 
-$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml
-> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
-> Workstation number: 5, link number: 7
-
 $ ${bindir:=.}/basic_parsing_test ./properties.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'host/model' to 'compound'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/optim' to 'TI'
diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
deleted file mode 100644
index c93c4e25e6..0000000000
--- a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>
-</platform>
diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh
index 17b7ad4414..894323dd29 100644
--- a/teshsuite/simdag/platforms/get_full_link.tesh
+++ b/teshsuite/simdag/platforms/get_full_link.tesh
@@ -72,115 +72,3 @@ $ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK
 >   Route size 1
 >   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
 >   Route latency = 0.000015, route bandwidth = 498000000.000000
-
-$ ${bindir:=.}/basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK
-> [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
-> Workstation number: 5, link number: 7
-> Route between host1 and host1
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host1 and host2
->   Route size 1
->   Link link1: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host1 and host3
->   Route size 1
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host1 and host4
->   Route size 2
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host1 and host5
->   Route size 2
->   Link link1: latency = 0.000050, bandwidth = 125000000.000000
->   Link link5: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host2 and host1
->   Route size 1
->   Link link1: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host2 and host2
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host2 and host3
->   Route size 1
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host2 and host4
->   Route size 2
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host2 and host5
->   Route size 1
->   Link link5: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host3 and host1
->   Route size 1
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host3 and host2
->   Route size 1
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host3 and host3
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host3 and host4
->   Route size 1
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host3 and host5
->   Route size 1
->   Link link6: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host4 and host1
->   Route size 2
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Link link2: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host4 and host2
->   Route size 2
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Link link3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host4 and host3
->   Route size 1
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host4 and host4
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
-> Route between host4 and host5
->   Route size 2
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Link link6: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host5 and host1
->   Route size 2
->   Link link5: latency = 0.000050, bandwidth = 125000000.000000
->   Link link1: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host5 and host2
->   Route size 1
->   Link link5: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host5 and host3
->   Route size 1
->   Link link6: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000050, route bandwidth = 125000000.000000
-> Route between host5 and host4
->   Route size 2
->   Link link6: latency = 0.000050, bandwidth = 125000000.000000
->   Link link4: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
-> Route between host5 and host5
->   Route size 1
->   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
->   Route latency = 0.000015, route bandwidth = 498000000.000000
\ No newline at end of file