X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddb9b227cc31cdf0f74b65b9c0312fd416417c57..d9a2ba6da1bdc02e8adeb3e87f792d5291b2ea10:/teshsuite/simdag/platforms/flatifier.tesh
diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index d3ff0f4fe5..bdc2b5d2ed 100644
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -1,5 +1,7 @@
-$ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+#! ./tesh
+
+$ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -9,6 +11,7 @@ $ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
>
>
>
+>
>
>
>
@@ -17,86 +20,119 @@ $ ./flatifier$EXEEXT one_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
>
>
>
->
->
+>
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
->
->
->
->
->
->
->
->
->
->
->
+>
+>
>
->
->
+>
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -104,13 +140,13 @@ $ ./flatifier$EXEEXT one_host_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -122,13 +158,13 @@ $ ./flatifier$EXEEXT one_host_properties.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -136,13 +172,13 @@ $ ./flatifier$EXEEXT one_host_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -150,13 +186,13 @@ $ ./flatifier$EXEEXT one_host_state_off.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -164,13 +200,13 @@ $ ./flatifier$EXEEXT one_host_state_on.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -178,13 +214,13 @@ $ ./flatifier$EXEEXT one_host_trace_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -192,13 +228,13 @@ $ ./flatifier$EXEEXT one_host_trace_inside.xml --log=root.fmt:[%10.6r]%e(%i:%P@%
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -206,13 +242,13 @@ $ ./flatifier$EXEEXT one_host.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -221,13 +257,13 @@ $ ./flatifier$EXEEXT one_link_availability.xml --log=root.fmt:[%10.6r]%e(%i:%P@%
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -236,13 +272,13 @@ $ ./flatifier$EXEEXT one_link_fatpipe.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -251,13 +287,13 @@ $ ./flatifier$EXEEXT one_link_shared.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -266,13 +302,13 @@ $ ./flatifier$EXEEXT one_link_state_file.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)
>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -285,37 +321,37 @@ $ ./flatifier$EXEEXT three_hosts_non_symmetric_route.xml --log=root.fmt:[%10.6r]
>
>
>
->
->
->
->
+>
>
>
->
+>
>
->
->
->
->
->
->
->
->
+>
+>
>
>
->
+>
+>
+>
+>
>
>
->
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
>
>
>
-$ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -330,6 +366,8 @@ $ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
>
>
>
+>
+>
>
>
>
@@ -346,311 +384,443 @@ $ ./flatifier$EXEEXT two_clusters.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
>
>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
+>
+>
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
+>
+>
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
>
->
->
->
->
+>
>
>
->
->
->
->
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
+>
+>
+>
+>
+>
+>
>
>
->
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
>
->
->
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
+>
>
>
>
-$ ./flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -662,22 +832,22 @@ $ ./flatifier$EXEEXT two_hosts_multi_hop.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>
-$ ./flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
-> [ 0.000000] (0:@) surf_workstation_model_init_ptask_L07
+$ ./flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n
+> [ 0.000000] [0:@] surf_workstation_model_init_ptask_L07
>
>
>
@@ -687,16 +857,16 @@ $ ./flatifier$EXEEXT two_hosts_one_link.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%
>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
->
+>
>
>
>