From: navarrop Date: Tue, 28 Sep 2010 13:10:42 +0000 (+0000) Subject: Make the new flatifier test X-Git-Tag: v3_5~539 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a7c08982b3f088eca94de033eb9f0d86fc8bc4c9 Make the new flatifier test git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8285 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 008bfa77b7..10bd423c92 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -263,10 +263,6 @@ set_tests_properties(tesh-gras-dd-r_big32_2 PROPERTIES WILL_FAIL true) # Expected to fail until the parser gets better (v3.3.5?) set_tests_properties(simdag-metaxml_test PROPERTIES WILL_FAIL true) -set_tests_properties(tesh-simdag-flatifier PROPERTIES WILL_FAIL true) - -# Expected to fail until tag cluster is finish -set_tests_properties(tesh-simdag-parser PROPERTIES WILL_FAIL true) if(HAVE_RUBY) set_tests_properties(ruby-quicksort PROPERTIES WILL_FAIL true) diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c index 86f2941de2..cff8b2b407 100644 --- a/teshsuite/simdag/platforms/flatifier.c +++ b/teshsuite/simdag/platforms/flatifier.c @@ -61,6 +61,7 @@ int main(int argc, char **argv) printf("\n"); printf("\n"); printf("\n"); + printf("\n"); totalHosts = SD_workstation_get_number(); hosts = SD_workstation_get_list(); @@ -117,6 +118,7 @@ int main(int argc, char **argv) } } } + printf("\n"); printf("\n"); SD_exit(); diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index c4d55a12c1..aa4410122d 100644 --- a/teshsuite/simdag/platforms/flatifier.tesh +++ b/teshsuite/simdag/platforms/flatifier.tesh @@ -1,1377 +1,325 @@ -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_cluster.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier one_cluster.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > +> > > > > > > -> -> -> -> -> -> +> +> +> +> +> +> +> > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > +> > -p stop here. -$ false - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_cluster_foreach.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier one_host_availability.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > -> -> -> -> -> +> +> > -> -> -> -> -> -> -> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_host_properties.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_host_state_file.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_host_state_off.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_host_state_on.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> > > +> > -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_cluster_one_host_random.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier one_host_trace_file.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > -> -> -> -> -> +> +> > -> -> -> -> > > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_host_trace_inside.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_host.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_link_availability.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_link_fatpipe.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> +> > > +> > -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_cluster_one_host.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier one_link_shared.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > -> -> -> -> -> -> +> +> > -> -> -> -> -> -> -> -> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier one_link_state_file.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> + +$ ./flatifier three_hosts_non_symmetric_route.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> +> +> +> +> +> +> +> +> +> +> +> > > -> -> -> -> -> -> -> -> -> -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> -> -> -> -> -> -> -> -> -> +> +> > -> -> +> +> > -> -> +> +> > -> +> > > -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_cluster_properties_foreach.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_cluster_properties_override.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_availability.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_properties.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_state_file.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_state_off.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_state_on.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_trace_file.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host_trace_inside.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_host.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_link_availability.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_link_fatpipe.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_link_shared.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ one_link_state_file.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ route_override.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ three_hosts_non_symmetric_route.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> - -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_clusters_symmetric.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> -> +> > -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_clusters.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier two_clusters.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > +> > > > @@ -1383,326 +331,330 @@ $ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_clu > > > -> -> -> -> -> -> +> +> +> +> +> +> +> > -> -> -> -> -> -> +> +> +> +> +> +> +> > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > +> > -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_hosts_multi_hop.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier two_hosts_multi_hop.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > +> > > > @@ -1721,13 +673,15 @@ $ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_hos > > > +> > -$ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_hosts_one_link.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms/' +$ ./flatifier two_hosts_one_link.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > > > +> > > > @@ -1744,4 +698,5 @@ $ ./simdag/platforms/flatifier --cfg=path:${srcdir:=.}/simdag/platforms/ two_hos > > > +> > diff --git a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml b/teshsuite/simdag/platforms/one_cluster_one_host_random.xml index 41f46a851d..3256d5beff 100644 --- a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml +++ b/teshsuite/simdag/platforms/one_cluster_one_host_random.xml @@ -1,6 +1,7 @@ + @@ -14,4 +15,5 @@ + diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml index 6beabde5b8..039e533db6 100644 --- a/teshsuite/simdag/platforms/one_host.xml +++ b/teshsuite/simdag/platforms/one_host.xml @@ -1,5 +1,7 @@ + + diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml index 3fc4f9f5ed..c017be8c5b 100644 --- a/teshsuite/simdag/platforms/one_host_availability.xml +++ b/teshsuite/simdag/platforms/one_host_availability.xml @@ -1,6 +1,8 @@ + + diff --git a/teshsuite/simdag/platforms/one_host_properties.xml b/teshsuite/simdag/platforms/one_host_properties.xml index 54fcf09dca..49d69d2e16 100644 --- a/teshsuite/simdag/platforms/one_host_properties.xml +++ b/teshsuite/simdag/platforms/one_host_properties.xml @@ -1,9 +1,11 @@ + + diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml index 1d14b44dd8..df99b60cb7 100644 --- a/teshsuite/simdag/platforms/one_host_state_file.xml +++ b/teshsuite/simdag/platforms/one_host_state_file.xml @@ -1,6 +1,8 @@ + + diff --git a/teshsuite/simdag/platforms/one_host_state_off.xml b/teshsuite/simdag/platforms/one_host_state_off.xml index d870c375db..a423e1540a 100644 --- a/teshsuite/simdag/platforms/one_host_state_off.xml +++ b/teshsuite/simdag/platforms/one_host_state_off.xml @@ -1,6 +1,8 @@ + + diff --git a/teshsuite/simdag/platforms/one_host_state_on.xml b/teshsuite/simdag/platforms/one_host_state_on.xml index b08db76117..11a6981c39 100644 --- a/teshsuite/simdag/platforms/one_host_state_on.xml +++ b/teshsuite/simdag/platforms/one_host_state_on.xml @@ -1,6 +1,8 @@ + + diff --git a/teshsuite/simdag/platforms/one_host_trace_file.xml b/teshsuite/simdag/platforms/one_host_trace_file.xml index 1416d3440a..a43e4e7999 100644 --- a/teshsuite/simdag/platforms/one_host_trace_file.xml +++ b/teshsuite/simdag/platforms/one_host_trace_file.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/teshsuite/simdag/platforms/one_host_trace_inside.xml b/teshsuite/simdag/platforms/one_host_trace_inside.xml index bcd63ae9e0..7cbd0978bd 100644 --- a/teshsuite/simdag/platforms/one_host_trace_inside.xml +++ b/teshsuite/simdag/platforms/one_host_trace_inside.xml @@ -1,8 +1,9 @@ + - + 0.0 1.0 11.0 0.5 @@ -10,4 +11,5 @@ + diff --git a/teshsuite/simdag/platforms/one_link_availability.xml b/teshsuite/simdag/platforms/one_link_availability.xml index c6b7a70776..9df0ac1f6e 100644 --- a/teshsuite/simdag/platforms/one_link_availability.xml +++ b/teshsuite/simdag/platforms/one_link_availability.xml @@ -1,7 +1,9 @@ + + diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml index 1155bc68f5..35a711497f 100644 --- a/teshsuite/simdag/platforms/one_link_fatpipe.xml +++ b/teshsuite/simdag/platforms/one_link_fatpipe.xml @@ -1,7 +1,9 @@ + + diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml index ac4dd3d5a2..9e45e73cd8 100644 --- a/teshsuite/simdag/platforms/one_link_shared.xml +++ b/teshsuite/simdag/platforms/one_link_shared.xml @@ -1,6 +1,8 @@ + + diff --git a/teshsuite/simdag/platforms/one_link_state_file.xml b/teshsuite/simdag/platforms/one_link_state_file.xml index 17773b989e..92f63dd8bb 100644 --- a/teshsuite/simdag/platforms/one_link_state_file.xml +++ b/teshsuite/simdag/platforms/one_link_state_file.xml @@ -1,7 +1,9 @@ + +