X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/198b09ec16ca1b8fc05053bcae9e75c0ad689711..b535dc5f8e8d9402e481b0186ddb81f11b486d01:/teshsuite/simdag/flatifier/flatifier.tesh diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh index a169178a2a..1b3acda8c1 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -1,9 +1,8 @@ -#! ./tesh -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +#!/usr/bin/env tesh +$ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -12,7 +11,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > -> +> > > > @@ -24,33 +23,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> > > > > > > +> +> +> > > > @@ -60,15 +41,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > -> -> -> > > > > > > +> +> +> > > > @@ -78,8 +59,23 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > -> -> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> > > > @@ -87,6 +83,9 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > +> +> +> > > > @@ -96,15 +95,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > -> -> -> > > > > > > +> +> +> > > > @@ -117,15 +116,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > > -> -> -> > > > > > > +> +> +> > > > @@ -135,11 +134,10 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -148,7 +146,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > -> +> > > > @@ -159,33 +157,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> > > > > > > +> +> +> > > > @@ -195,15 +175,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > -> -> -> > > > > > > +> +> +> > > > @@ -213,8 +193,23 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > -> -> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> > > > @@ -222,6 +217,9 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > +> +> +> > > > @@ -231,15 +229,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > -> -> -> > > > > > > +> +> +> > > > @@ -252,15 +250,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > > -> -> -> > > > > > > +> +> +> > > > @@ -270,11 +268,10 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -286,34 +283,33 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.xml "--log=root.fmt > > > -> -> +> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > -> +> > > > @@ -324,64 +320,62 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.xml "--log=root.fmt > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > > > -> +> > > > > > > -> -> -> > > > -> +> > > -> +> +> +> +> > > -> +> > > -> -> +> +> > -> +> > > -> +> > > > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > > > > -> > -> +> +> > > > @@ -393,65 +387,23 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[% > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> > > > > > > -> -> +> +> +> +> +> > > > > -> -> -> -> -> +> +> > > > @@ -459,41 +411,59 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[% > > > -> -> +> +> +> +> +> > > > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> > > > @@ -501,19 +471,42 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[% > > > +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > > -> +> > > > @@ -532,16 +525,15 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.xml "--log=root > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > > -> +> > > > @@ -558,20 +550,19 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.xml "--log=root. > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > > > -> > +> > -> +> > > > @@ -586,17 +577,17 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm > > > -> +> > > > > -> -> -> > > > +> +> +> > > > @@ -609,12 +600,12 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm > > > -> -> -> > > > +> +> +> > > > @@ -627,21 +618,39 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm > > > -> -> -> > > > +> +> +> > > > -> +> > > +> +> +> +> +> +> +> +> +> +> +> +> +> +> +> > > > +> +> +> > > > @@ -654,30 +663,12 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> > > > > -> -> -> > > > @@ -693,27 +684,26 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm > > -! output sort -$ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" +$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> +> +> +> +> > > > @@ -798,513 +788,512 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/cluster_torus.xm > > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> +> > > -> -> -> -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> +> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > > -