flatifier.cpp: revert change from commit ba1c6dce93, and omit empty routes from output.

[simgrid.git] / teshsuite / simdag / flatifier / flatifier.tesh

diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh
index 6e26e59..76f52ff 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.tesh
+++ b/teshsuite/simdag/flatifier/flatifier.tesh
@@ -112,8 +112,6 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e
 >   <route src="bob6.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
 >   <link_ctn id="bob_cluster_link_6_UP"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
 >   <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0_DOWN"/>
 >   </route>
@@ -244,8 +242,6 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt:
 >   <route src="bob6.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
 >   <link_ctn id="bob_cluster_link_6_UP"/>
 >   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
 >   <link_ctn id="bob_cluster_link_0_DOWN"/>
 >   </route>
@@ -451,8 +447,6 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%
 >   <route src="bob1.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
 >   <link_ctn id="bob_cluster_link_1_UP"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
->   <route src="alicealice_cluster_router.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
 >   <link_ctn id="backbone"/>
 >   </route>
@@ -471,8 +465,6 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alicealice_cluster_router.crepe.fr">
 >   <link_ctn id="backbone"/>
 >   </route>
->   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice0.crepe.fr">
 >   <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0_DOWN"/>
 >   </route>
@@ -614,8 +606,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--
 >   <route src="3" dst="my_cluster_3_router">
 >   <link_ctn id="my_cluster_3_link_3_UP"/>
 >   </route>
->   <route src="my_cluster_1_router" dst="my_cluster_1_router">
->   </route>
 >   <route src="my_cluster_1_router" dst="my_cluster_2_router">
 >   <link_ctn id="link_tmp"/>
 >   </route>
@@ -634,8 +624,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--
 >   <route src="my_cluster_2_router" dst="my_cluster_1_router">
 >   <link_ctn id="link2"/><link_ctn id="link1"/>
 >   </route>
->   <route src="my_cluster_2_router" dst="my_cluster_2_router">
->   </route>
 >   <route src="my_cluster_2_router" dst="my_cluster_3_router">
 >   <link_ctn id="link2"/><link_ctn id="link3"/>
 >   </route>
@@ -654,8 +642,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--
 >   <route src="my_cluster_3_router" dst="my_cluster_2_router">
 >   <link_ctn id="link3"/><link_ctn id="link2"/>
 >   </route>
->   <route src="my_cluster_3_router" dst="my_cluster_3_router">
->   </route>
 >   <route src="my_cluster_3_router" dst="1">
 >   <link_ctn id="link3"/><link_ctn id="link1"/><link_ctn id="my_cluster_1_link_1_DOWN"/>
 >   </route>