Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a57b407)
Add new tests for basic parsing.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 28 Sep 2010 14:00:12 +0000 (14:00 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 28 Sep 2010 14:00:12 +0000 (14:00 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8289 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/AddTests.cmake patch | blob | history
teshsuite/simdag/platforms/basic_parsing_test.tesh patch | blob | history

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index db7cacc..008b4c0 100644 (file)
--- 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-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)
 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 31d08de..c29d9d8 100644 (file)
--- 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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [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
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
+> Workstation number: 2, link number: 2
Clone of SimGrid repository with local patches