From fdcea1c1e992733bb739825d8a192fe7597480b6 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 14:00:12 +0000 Subject: [PATCH] Add new tests for basic parsing. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8289 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/AddTests.cmake | 2 +- .../simdag/platforms/basic_parsing_test.tesh | 63 ++++++++++--------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index db7cacc202..008b4c0d34 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -88,7 +88,7 @@ ENDIF(${ARCH_32_BITS}) ADD_TEST(tesh-msg-get_sender ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh) ADD_TEST(tesh-simdag-reinit_costs ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh) -ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/basic_parsing_test.tesh) +ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh) ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) ADD_TEST(tesh-simdag-basic0 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh) ADD_TEST(tesh-simdag-basic1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh) diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index 31d08de3bb..c29d9d85f0 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -1,62 +1,67 @@ -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_foreach.xml +$ ./basic_parsing_test one_cluster.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 5, link number: 8 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_one_host_random.xml +$ ./basic_parsing_test one_host_availability.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_one_host.xml +$ ./basic_parsing_test one_host_properties.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_properties_foreach.xml +$ ./basic_parsing_test one_host_state_file.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster.xml +$ ./basic_parsing_test one_host_state_off.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_availability.xml +$ ./basic_parsing_test one_host_state_on.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_properties.xml +$ ./basic_parsing_test one_host_trace_file.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_file.xml +$ ./basic_parsing_test one_host_trace_inside.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_off.xml +$ ./basic_parsing_test one_host.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 1 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_on.xml +$ ./basic_parsing_test one_link_availability.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 2 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_trace_inside.xml +$ ./basic_parsing_test one_link_fatpipe.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 2 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host.xml +$ ./basic_parsing_test one_link_shared.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 2 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_availability.xml +$ ./basic_parsing_test one_link_state_file.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 1, link number: 2 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_fatpipe.xml +$ ./basic_parsing_test three_hosts_non_symmetric_route.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 3, link number: 4 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_shared.xml +$ ./basic_parsing_test two_clusters.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 10, link number: 16 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_state_file.xml +$ ./basic_parsing_test two_hosts_multi_hop.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 2, link number: 4 -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms three_hosts_non_symmetric_route.xml -> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 - -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_clusters_symmetric.xml -> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 - -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_clusters.xml -> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 - -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_hosts_multi_hop.xml -> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 - -$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_hosts_one_link.xml +$ ./basic_parsing_test two_hosts_one_link.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 2, link number: 2 -- 2.20.1