remove now useless platform files (replaced by ptask_L07.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index cabc1dc..4486216 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -768,8 +768,6 @@ include teshsuite/simdag/basic4/basic4.c
 include teshsuite/simdag/basic4/basic4.tesh
 include teshsuite/simdag/basic5/basic5.c
 include teshsuite/simdag/basic5/basic5.tesh
-include teshsuite/simdag/basic6/basic6.c
-include teshsuite/simdag/basic6/basic6.tesh
 include teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.c
 include teshsuite/simdag/comm-p2p-latency-bound/comm-p2p-latency-bound.tesh
 include teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
@@ -796,10 +794,6 @@ include teshsuite/simdag/platforms/one_cluster_multicore.xml
 include teshsuite/simdag/platforms/one_cluster_router_id.xml
 include teshsuite/simdag/platforms/one_cluster_splitduplex.xml
 include teshsuite/simdag/platforms/platform_2p_1bb.xml
-include teshsuite/simdag/platforms/platform_2p_1fl.xml
-include teshsuite/simdag/platforms/platform_2p_1sl.xml
-include teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
-include teshsuite/simdag/platforms/platform_2p_1switch.xml
 include teshsuite/simdag/platforms/platform_4p_1switch.xml
 include teshsuite/simdag/platforms/properties.xml
 include teshsuite/simdag/platforms/test_of_is_router.xml

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index ee04ffd..8b2a3f7 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -44,11 +44,7 @@ set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_h
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_splitduplex.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/Dijkstra.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1bb.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1fl.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1sl.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1sl_hetero.xml
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1switch.xml          PARENT_SCOPE)
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/platform_2p_1bb.xml              PARENT_SCOPE)
 set(txt_files     ${txt_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/carol.fail
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bob.trace
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/erin.avail

diff --git a/teshsuite/simdag/platforms/platform_2p_1fl.xml b/teshsuite/simdag/platforms/platform_2p_1fl.xml
deleted file mode 100644 (file)
index 22aa6e3..0000000
--- a/teshsuite/simdag/platforms/platform_2p_1fl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-  <zone 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>
-  </zone>
-</platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1sl.xml b/teshsuite/simdag/platforms/platform_2p_1sl.xml
deleted file mode 100644 (file)
index 3b5c55a..0000000
--- a/teshsuite/simdag/platforms/platform_2p_1sl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-  <zone  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>
-  </zone>
-</platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
deleted file mode 100644 (file)
index 6771667..0000000
--- a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-  <zone  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>
-  </zone>
-</platform>

diff --git a/teshsuite/simdag/platforms/platform_2p_1switch.xml b/teshsuite/simdag/platforms/platform_2p_1switch.xml
deleted file mode 100644 (file)
index 00cdf1f..0000000
--- a/teshsuite/simdag/platforms/platform_2p_1switch.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-  <zone  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"/>
-
-    <route src="cpu0" dst="cpu1">
-      <link_ctn id="link0"/>
-      <link_ctn id="switch"/>
-      <link_ctn id="link1"/>
-    </route>
-  </zone>
-</platform>

diff --git a/teshsuite/simdag/platforms/platform_4p_1switch.xml b/teshsuite/simdag/platforms/platform_4p_1switch.xml
deleted file mode 100644 (file)
index b49e42f..0000000
--- a/teshsuite/simdag/platforms/platform_4p_1switch.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
-<platform version="4.1">
-  <zone 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>
-  </zone>
-</platform>