From a984f41a503299f5d2e660422520a7d0e0e5391d Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Sun, 2 Jan 2022 20:09:42 +0100 Subject: [PATCH] move platforms and flatifier to teshsuite/platforms --- .gitignore | 2 +- MANIFEST.in | 68 +++++++------- .../{simdag => platforms}/CMakeLists.txt | 90 +++++++++---------- teshsuite/{simdag => }/platforms/Dijkstra.xml | 0 teshsuite/{simdag => }/platforms/bob.trace | 0 .../platforms/bogus_missing_dst_gateway.xml | 0 .../platforms/bogus_missing_gateway.tesh | 11 +++ .../platforms/bogus_missing_src_gateway.xml | 0 .../platforms/bogus_two_hosts_asymetric.tesh | 3 + .../platforms/bogus_two_hosts_asymetric.xml | 0 teshsuite/{simdag => }/platforms/carol.fail | 0 .../cluster_dragonfly_noncontiguous_rad.xml | 0 .../cluster_fat_tree_noncontiguous_rad.xml | 0 .../cluster_torus_noncontiguous_rad.xml | 0 teshsuite/{simdag => }/platforms/erin.avail | 0 .../flatifier => platforms}/flatifier.cpp | 18 ++-- .../flatifier => platforms}/flatifier.tesh | 26 +++--- .../platforms/four_hosts_floyd.xml | 0 .../platforms/host_attributes.xml | 0 teshsuite/{simdag => }/platforms/link.bw | 0 teshsuite/{simdag => }/platforms/link.fail | 0 teshsuite/{simdag => }/platforms/link.lat | 0 .../platforms/link_attributes.xml | 0 .../{simdag => }/platforms/one_cluster.xml | 0 .../platforms/one_cluster_multicore.xml | 0 .../platforms/one_cluster_router_id.xml | 0 .../platforms/one_cluster_splitduplex.xml | 0 .../{simdag => }/platforms/properties.xml | 0 .../platforms/test_of_is_router.xml | 0 .../three_hosts_non_symmetric_route.xml | 0 .../{simdag => }/platforms/two_clusters.xml | 0 .../platforms/two_clusters_one_name.xml | 0 .../platforms/two_clusters_router_id.xml | 0 .../platforms/two_hosts_multi_hop.xml | 0 .../platforms/two_hosts_one_link.xml | 0 .../two_hosts_one_link_splitduplex.xml | 0 teshsuite/s4u/CMakeLists.txt | 4 +- .../s4u/basic-link-test/basic-link-test.tesh | 4 +- .../basic-parsing-test-sym-full.tesh | 12 +-- .../basic-parsing-test.tesh | 20 ++--- teshsuite/s4u/is-router/is-router.tesh | 2 +- .../flatifier/bogus_missing_gateway.tesh | 11 --- .../flatifier/bogus_two_hosts_asymetric.tesh | 3 - tools/cmake/DefinePackages.cmake | 2 +- tools/graphicator/graphicator.tesh | 2 +- 45 files changed, 136 insertions(+), 142 deletions(-) rename teshsuite/{simdag => platforms}/CMakeLists.txt (52%) rename teshsuite/{simdag => }/platforms/Dijkstra.xml (100%) rename teshsuite/{simdag => }/platforms/bob.trace (100%) rename teshsuite/{simdag => }/platforms/bogus_missing_dst_gateway.xml (100%) create mode 100644 teshsuite/platforms/bogus_missing_gateway.tesh rename teshsuite/{simdag => }/platforms/bogus_missing_src_gateway.xml (100%) create mode 100644 teshsuite/platforms/bogus_two_hosts_asymetric.tesh rename teshsuite/{simdag => }/platforms/bogus_two_hosts_asymetric.xml (100%) rename teshsuite/{simdag => }/platforms/carol.fail (100%) rename teshsuite/{simdag => }/platforms/cluster_dragonfly_noncontiguous_rad.xml (100%) rename teshsuite/{simdag => }/platforms/cluster_fat_tree_noncontiguous_rad.xml (100%) rename teshsuite/{simdag => }/platforms/cluster_torus_noncontiguous_rad.xml (100%) rename teshsuite/{simdag => }/platforms/erin.avail (100%) rename teshsuite/{simdag/flatifier => platforms}/flatifier.cpp (92%) rename teshsuite/{simdag/flatifier => platforms}/flatifier.tesh (98%) rename teshsuite/{simdag => }/platforms/four_hosts_floyd.xml (100%) rename teshsuite/{simdag => }/platforms/host_attributes.xml (100%) rename teshsuite/{simdag => }/platforms/link.bw (100%) rename teshsuite/{simdag => }/platforms/link.fail (100%) rename teshsuite/{simdag => }/platforms/link.lat (100%) rename teshsuite/{simdag => }/platforms/link_attributes.xml (100%) rename teshsuite/{simdag => }/platforms/one_cluster.xml (100%) rename teshsuite/{simdag => }/platforms/one_cluster_multicore.xml (100%) rename teshsuite/{simdag => }/platforms/one_cluster_router_id.xml (100%) rename teshsuite/{simdag => }/platforms/one_cluster_splitduplex.xml (100%) rename teshsuite/{simdag => }/platforms/properties.xml (100%) rename teshsuite/{simdag => }/platforms/test_of_is_router.xml (100%) rename teshsuite/{simdag => }/platforms/three_hosts_non_symmetric_route.xml (100%) rename teshsuite/{simdag => }/platforms/two_clusters.xml (100%) rename teshsuite/{simdag => }/platforms/two_clusters_one_name.xml (100%) rename teshsuite/{simdag => }/platforms/two_clusters_router_id.xml (100%) rename teshsuite/{simdag => }/platforms/two_hosts_multi_hop.xml (100%) rename teshsuite/{simdag => }/platforms/two_hosts_one_link.xml (100%) rename teshsuite/{simdag => }/platforms/two_hosts_one_link_splitduplex.xml (100%) delete mode 100644 teshsuite/simdag/flatifier/bogus_missing_gateway.tesh delete mode 100644 teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh diff --git a/.gitignore b/.gitignore index b6a38ed9f3..a8f80fccb4 100644 --- a/.gitignore +++ b/.gitignore @@ -298,6 +298,7 @@ teshsuite/models/ptask_L07_usage/ptask_L07_usage teshsuite/models/wifi_usage/wifi_usage teshsuite/models/wifi_usage_decay/wifi_usage_decay teshsuite/msg/task_destroy_cancel/task_destroy_cancel +teshsuite/platforms/flatifier teshsuite/s4u/activity-lifecycle/activity-lifecycle teshsuite/s4u/actor/actor teshsuite/s4u/actor-autorestart/actor-autorestart @@ -323,7 +324,6 @@ teshsuite/s4u/storage_client_server/storage_client_server teshsuite/s4u/trace-integration/trace-integration teshsuite/s4u/vm-live-migration/vm-live-migration teshsuite/s4u/wait-any-for/wait-any-for -teshsuite/simdag/flatifier/flatifier teshsuite/smpi/auto-shared/auto-shared teshsuite/smpi/bug-17132/bug-17132 teshsuite/smpi/coll-allgather/coll-allgather diff --git a/MANIFEST.in b/MANIFEST.in index 576b495018..64f23fa6e1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -710,6 +710,39 @@ include teshsuite/models/wifi_usage_decay/wifi_usage_decay.cpp include teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c include teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh +include teshsuite/platforms/Dijkstra.xml +include teshsuite/platforms/bob.trace +include teshsuite/platforms/bogus_missing_dst_gateway.xml +include teshsuite/platforms/bogus_missing_gateway.tesh +include teshsuite/platforms/bogus_missing_src_gateway.xml +include teshsuite/platforms/bogus_two_hosts_asymetric.tesh +include teshsuite/platforms/bogus_two_hosts_asymetric.xml +include teshsuite/platforms/carol.fail +include teshsuite/platforms/cluster_dragonfly_noncontiguous_rad.xml +include teshsuite/platforms/cluster_fat_tree_noncontiguous_rad.xml +include teshsuite/platforms/cluster_torus_noncontiguous_rad.xml +include teshsuite/platforms/erin.avail +include teshsuite/platforms/flatifier.cpp +include teshsuite/platforms/flatifier.tesh +include teshsuite/platforms/four_hosts_floyd.xml +include teshsuite/platforms/host_attributes.xml +include teshsuite/platforms/link.bw +include teshsuite/platforms/link.fail +include teshsuite/platforms/link.lat +include teshsuite/platforms/link_attributes.xml +include teshsuite/platforms/one_cluster.xml +include teshsuite/platforms/one_cluster_multicore.xml +include teshsuite/platforms/one_cluster_router_id.xml +include teshsuite/platforms/one_cluster_splitduplex.xml +include teshsuite/platforms/properties.xml +include teshsuite/platforms/test_of_is_router.xml +include teshsuite/platforms/three_hosts_non_symmetric_route.xml +include teshsuite/platforms/two_clusters.xml +include teshsuite/platforms/two_clusters_one_name.xml +include teshsuite/platforms/two_clusters_router_id.xml +include teshsuite/platforms/two_hosts_multi_hop.xml +include teshsuite/platforms/two_hosts_one_link.xml +include teshsuite/platforms/two_hosts_one_link_splitduplex.xml include teshsuite/python/borken-context/borken-context.py include teshsuite/python/borken-context/borken-context.tesh include teshsuite/python/borken-context/borken-context_d.xml @@ -804,39 +837,6 @@ include teshsuite/s4u/wait-all-for/wait-all-for.cpp include teshsuite/s4u/wait-all-for/wait-all-for.tesh include teshsuite/s4u/wait-any-for/wait-any-for.cpp include teshsuite/s4u/wait-any-for/wait-any-for.tesh -include teshsuite/simdag/flatifier/bogus_missing_gateway.tesh -include teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh -include teshsuite/simdag/flatifier/flatifier.cpp -include teshsuite/simdag/flatifier/flatifier.tesh -include teshsuite/simdag/platforms/Dijkstra.xml -include teshsuite/simdag/platforms/bob.trace -include teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml -include teshsuite/simdag/platforms/bogus_missing_src_gateway.xml -include teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml -include teshsuite/simdag/platforms/carol.fail -include teshsuite/simdag/platforms/cluster_dragonfly_noncontiguous_rad.xml -include teshsuite/simdag/platforms/cluster_fat_tree_noncontiguous_rad.xml -include teshsuite/simdag/platforms/cluster_torus_noncontiguous_rad.xml -include teshsuite/simdag/platforms/erin.avail -include teshsuite/simdag/platforms/four_hosts_floyd.xml -include teshsuite/simdag/platforms/host_attributes.xml -include teshsuite/simdag/platforms/link.bw -include teshsuite/simdag/platforms/link.fail -include teshsuite/simdag/platforms/link.lat -include teshsuite/simdag/platforms/link_attributes.xml -include teshsuite/simdag/platforms/one_cluster.xml -include teshsuite/simdag/platforms/one_cluster_multicore.xml -include teshsuite/simdag/platforms/one_cluster_router_id.xml -include teshsuite/simdag/platforms/one_cluster_splitduplex.xml -include teshsuite/simdag/platforms/properties.xml -include teshsuite/simdag/platforms/test_of_is_router.xml -include teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml -include teshsuite/simdag/platforms/two_clusters.xml -include teshsuite/simdag/platforms/two_clusters_one_name.xml -include teshsuite/simdag/platforms/two_clusters_router_id.xml -include teshsuite/simdag/platforms/two_hosts_multi_hop.xml -include teshsuite/simdag/platforms/two_hosts_one_link.xml -include teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml include teshsuite/smpi/auto-shared/auto-shared.c include teshsuite/smpi/auto-shared/auto-shared.tesh include teshsuite/smpi/bug-17132/bug-17132.c @@ -2752,9 +2752,9 @@ include teshsuite/lua/lua_platforms.tesh include teshsuite/mc/CMakeLists.txt include teshsuite/models/CMakeLists.txt include teshsuite/msg/CMakeLists.txt +include teshsuite/platforms/CMakeLists.txt include teshsuite/python/CMakeLists.txt include teshsuite/s4u/CMakeLists.txt -include teshsuite/simdag/CMakeLists.txt include teshsuite/smpi/CMakeLists.txt include teshsuite/smpi/isp/umpire/CMakeLists.txt include teshsuite/smpi/mpich3-test/CMakeLists.txt diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/platforms/CMakeLists.txt similarity index 52% rename from teshsuite/simdag/CMakeLists.txt rename to teshsuite/platforms/CMakeLists.txt index 020ab6265e..f239bbf759 100644 --- a/teshsuite/simdag/CMakeLists.txt +++ b/teshsuite/platforms/CMakeLists.txt @@ -1,56 +1,52 @@ -foreach(x flatifier) - add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp) - target_link_libraries(${x} simgrid) - set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) - set_property(TARGET ${x} APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") - add_dependencies(tests ${x}) +add_executable (flatifier EXCLUDE_FROM_ALL flatifier.cpp) +target_link_libraries(flatifier simgrid) +set_target_properties(flatifier PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +set_property(TARGET flatifier APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") +add_dependencies(tests flatifier) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) - set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp) -endforeach() - -set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_two_hosts_asymetric.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_missing_gateway.tesh +set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.cpp PARENT_SCOPE) +set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_gateway.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/flatifier.tesh + PARENT_SCOPE) +set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd.xml + ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml + ${CMAKE_CURRENT_SOURCE_DIR}/host_attributes.xml + ${CMAKE_CURRENT_SOURCE_DIR}/link_attributes.xml + ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml + ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_splitduplex.xml + ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml + ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml + ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml + ${CMAKE_CURRENT_SOURCE_DIR}/three_hosts_non_symmetric_route.xml + ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_one_name.xml + ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_router_id.xml + ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters.xml + ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_src_gateway.xml + ${CMAKE_CURRENT_SOURCE_DIR}/bogus_missing_dst_gateway.xml + ${CMAKE_CURRENT_SOURCE_DIR}/bogus_two_hosts_asymetric.xml + ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_splitduplex.xml + ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link.xml + ${CMAKE_CURRENT_SOURCE_DIR}/cluster_dragonfly_noncontiguous_rad.xml + ${CMAKE_CURRENT_SOURCE_DIR}/cluster_fat_tree_noncontiguous_rad.xml + ${CMAKE_CURRENT_SOURCE_DIR}/cluster_torus_noncontiguous_rad.xml + ${CMAKE_CURRENT_SOURCE_DIR}/Dijkstra.xml + PARENT_SCOPE) +set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/carol.fail + ${CMAKE_CURRENT_SOURCE_DIR}/bob.trace + ${CMAKE_CURRENT_SOURCE_DIR}/erin.avail + ${CMAKE_CURRENT_SOURCE_DIR}/link.bw + ${CMAKE_CURRENT_SOURCE_DIR}/link.fail + ${CMAKE_CURRENT_SOURCE_DIR}/link.lat PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_multicore.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_splitduplex.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster_router_id.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/one_cluster.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/properties.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/test_of_is_router.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/three_hosts_non_symmetric_route.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_clusters_one_name.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_clusters_router_id.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_clusters.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_src_gateway.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_missing_dst_gateway.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bogus_two_hosts_asymetric.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link_splitduplex.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_one_link.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/cluster_dragonfly_noncontiguous_rad.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/cluster_fat_tree_noncontiguous_rad.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/cluster_torus_noncontiguous_rad.xml - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/Dijkstra.xml PARENT_SCOPE) -set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/platforms/carol.fail - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/bob.trace - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/erin.avail - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.bw - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.fail - ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.lat PARENT_SCOPE) -foreach(x flatifier) - ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh) -endforeach() +ADD_TESH(tesh-platform-flatifier --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms flatifier.tesh) if(enable_debug) # these tests need assertions - ADD_TESH(tesh-parser-bogus-symmetric --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh) - ADD_TESH(tesh-parser-bogus-missing-gw --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/flatifier --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh) + ADD_TESH(tesh-parser-bogus-symmetric --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms/bogus_two_hosts_asymetric.tesh) + ADD_TESH(tesh-parser-bogus-missing-gw --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms/bogus_missing_gateway.tesh) #These tests fail on Windows as the signal returned is not the same as Unix would send. if(WIN32) diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/platforms/Dijkstra.xml similarity index 100% rename from teshsuite/simdag/platforms/Dijkstra.xml rename to teshsuite/platforms/Dijkstra.xml diff --git a/teshsuite/simdag/platforms/bob.trace b/teshsuite/platforms/bob.trace similarity index 100% rename from teshsuite/simdag/platforms/bob.trace rename to teshsuite/platforms/bob.trace diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/platforms/bogus_missing_dst_gateway.xml similarity index 100% rename from teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml rename to teshsuite/platforms/bogus_missing_dst_gateway.xml diff --git a/teshsuite/platforms/bogus_missing_gateway.tesh b/teshsuite/platforms/bogus_missing_gateway.tesh new file mode 100644 index 0000000000..1672ca41af --- /dev/null +++ b/teshsuite/platforms/bogus_missing_gateway.tesh @@ -0,0 +1,11 @@ +! expect signal SIGABRT +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ./bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +> [ 0.000000] [0:maestro@] Parse error at ./bogus_missing_src_gateway.xml:14: zoneRoute gw_src='nod-cluster_router.cluster.us' does name a node. Existing netpoints: +> 'node-1.cluster.us','node-2.cluster.us','node-3.cluster.us','node-4.cluster.us','node-cluster_router.cluster.us','noeud-1.grappe.fr','noeud-2.grappe.fr','noeud-3.grappe.fr','noeud-4.grappe.fr','noeud-grappe_router.grappe.fr' +> [ 0.000000] [0:maestro@] Exiting now. + +! expect signal SIGABRT +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ./bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +> [ 0.000000] [0:maestro@] Parse error at ./bogus_missing_dst_gateway.xml:14: zoneRoute gw_dst='neud-grappe_router.grappe.fr' does name a node. Existing netpoints: +> 'node-1.cluster.us','node-2.cluster.us','node-3.cluster.us','node-4.cluster.us','node-cluster_router.cluster.us','noeud-1.grappe.fr','noeud-2.grappe.fr','noeud-3.grappe.fr','noeud-4.grappe.fr','noeud-grappe_router.grappe.fr' +> [ 0.000000] [0:maestro@] Exiting now. diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/platforms/bogus_missing_src_gateway.xml similarity index 100% rename from teshsuite/simdag/platforms/bogus_missing_src_gateway.xml rename to teshsuite/platforms/bogus_missing_src_gateway.xml diff --git a/teshsuite/platforms/bogus_two_hosts_asymetric.tesh b/teshsuite/platforms/bogus_two_hosts_asymetric.tesh new file mode 100644 index 0000000000..8c14c4c908 --- /dev/null +++ b/teshsuite/platforms/bogus_two_hosts_asymetric.tesh @@ -0,0 +1,3 @@ +! expect signal SIGABRT +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ./bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --log=no_loc +> [ 0.000000] [0:maestro@] The route between alice and bob already exists (Rq: routes are symmetrical by default). diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/platforms/bogus_two_hosts_asymetric.xml similarity index 100% rename from teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml rename to teshsuite/platforms/bogus_two_hosts_asymetric.xml diff --git a/teshsuite/simdag/platforms/carol.fail b/teshsuite/platforms/carol.fail similarity index 100% rename from teshsuite/simdag/platforms/carol.fail rename to teshsuite/platforms/carol.fail diff --git a/teshsuite/simdag/platforms/cluster_dragonfly_noncontiguous_rad.xml b/teshsuite/platforms/cluster_dragonfly_noncontiguous_rad.xml similarity index 100% rename from teshsuite/simdag/platforms/cluster_dragonfly_noncontiguous_rad.xml rename to teshsuite/platforms/cluster_dragonfly_noncontiguous_rad.xml diff --git a/teshsuite/simdag/platforms/cluster_fat_tree_noncontiguous_rad.xml b/teshsuite/platforms/cluster_fat_tree_noncontiguous_rad.xml similarity index 100% rename from teshsuite/simdag/platforms/cluster_fat_tree_noncontiguous_rad.xml rename to teshsuite/platforms/cluster_fat_tree_noncontiguous_rad.xml diff --git a/teshsuite/simdag/platforms/cluster_torus_noncontiguous_rad.xml b/teshsuite/platforms/cluster_torus_noncontiguous_rad.xml similarity index 100% rename from teshsuite/simdag/platforms/cluster_torus_noncontiguous_rad.xml rename to teshsuite/platforms/cluster_torus_noncontiguous_rad.xml diff --git a/teshsuite/simdag/platforms/erin.avail b/teshsuite/platforms/erin.avail similarity index 100% rename from teshsuite/simdag/platforms/erin.avail rename to teshsuite/platforms/erin.avail diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/platforms/flatifier.cpp similarity index 92% rename from teshsuite/simdag/flatifier/flatifier.cpp rename to teshsuite/platforms/flatifier.cpp index f8f854c2cd..10bc1ae440 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/platforms/flatifier.cpp @@ -45,7 +45,7 @@ static void create_environment(xbt_os_timer_t parse_time, const std::string& pla static void dump_hosts() { - std::vector hosts = sg4::Engine::get_instance()->get_all_hosts(); + std::vector hosts = sg4::Engine::get_instance()->get_all_hosts(); std::sort(hosts.begin(), hosts.end(), [](const sg4::Host* a, const sg4::Host* b) { return a->get_name() < b->get_name(); }); @@ -75,14 +75,14 @@ static void dump_links() { std::vector links = sg4::Engine::get_instance()->get_all_links(); - std::sort(links.begin(), links.end(), [](const sg4::Link* a, const sg4::Link* b) { - return a->get_name() < b->get_name(); - }); + std::sort(links.begin(), links.end(), + [](const sg4::Link* a, const sg4::Link* b) { return a->get_name() < b->get_name(); }); for (auto link : links) { std::printf(" get_cname(), link->get_bandwidth(), link->get_latency()); + std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(), + link->get_latency()); if (link->is_shared()) { std::printf("/>\n"); } else { @@ -93,8 +93,7 @@ static void dump_links() static void dump_routers() { - std::vector netpoints = - sg4::Engine::get_instance()->get_all_netpoints(); + std::vector netpoints = sg4::Engine::get_instance()->get_all_netpoints(); std::sort(netpoints.begin(), netpoints.end(), [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) { return a->get_name() < b->get_name(); @@ -107,11 +106,10 @@ static void dump_routers() static void dump_routes() { - std::vector hosts = sg4::Engine::get_instance()->get_all_hosts(); + std::vector hosts = sg4::Engine::get_instance()->get_all_hosts(); std::sort(hosts.begin(), hosts.end(), [](const sg4::Host* a, const sg4::Host* b) { return a->get_name() < b->get_name(); }); - std::vector netpoints = - sg4::Engine::get_instance()->get_all_netpoints(); + std::vector netpoints = sg4::Engine::get_instance()->get_all_netpoints(); std::sort(netpoints.begin(), netpoints.end(), [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) { return a->get_name() < b->get_name(); diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/platforms/flatifier.tesh similarity index 98% rename from teshsuite/simdag/flatifier/flatifier.tesh rename to teshsuite/platforms/flatifier.tesh index 76f52ff7cb..7c8deab2e3 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/platforms/flatifier.tesh @@ -1,5 +1,5 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -130,7 +130,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e > > -$ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -260,7 +260,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt: > > -$ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -293,7 +293,7 @@ $ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6 > > -$ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -310,7 +310,7 @@ $ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6 > > -$ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -352,7 +352,7 @@ $ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log > > -$ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -480,7 +480,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]% > > -$ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -506,7 +506,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[% > > -$ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -1191,7 +1191,7 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo > > -$ ${bindir:=.}/flatifier ../platforms/cluster_dragonfly_noncontiguous_rad.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./cluster_dragonfly_noncontiguous_rad.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -1280,7 +1280,7 @@ $ ${bindir:=.}/flatifier ../platforms/cluster_dragonfly_noncontiguous_rad.xml "- > > -$ ${bindir:=.}/flatifier ../platforms/cluster_fat_tree_noncontiguous_rad.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./cluster_fat_tree_noncontiguous_rad.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -1377,7 +1377,7 @@ $ ${bindir:=.}/flatifier ../platforms/cluster_fat_tree_noncontiguous_rad.xml "-- > > -$ ${bindir:=.}/flatifier ../platforms/cluster_torus_noncontiguous_rad.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/flatifier ./cluster_torus_noncontiguous_rad.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -1469,7 +1469,8 @@ $ ${bindir:=.}/flatifier ../platforms/cluster_torus_noncontiguous_rad.xml "--log > > > -$ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link_splitduplex.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" + +$ ${bindir:=.}/flatifier ./two_hosts_one_link_splitduplex.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > > > @@ -1493,4 +1494,3 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link_splitduplex.xml "--log= > > > - diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/platforms/four_hosts_floyd.xml similarity index 100% rename from teshsuite/simdag/platforms/four_hosts_floyd.xml rename to teshsuite/platforms/four_hosts_floyd.xml diff --git a/teshsuite/simdag/platforms/host_attributes.xml b/teshsuite/platforms/host_attributes.xml similarity index 100% rename from teshsuite/simdag/platforms/host_attributes.xml rename to teshsuite/platforms/host_attributes.xml diff --git a/teshsuite/simdag/platforms/link.bw b/teshsuite/platforms/link.bw similarity index 100% rename from teshsuite/simdag/platforms/link.bw rename to teshsuite/platforms/link.bw diff --git a/teshsuite/simdag/platforms/link.fail b/teshsuite/platforms/link.fail similarity index 100% rename from teshsuite/simdag/platforms/link.fail rename to teshsuite/platforms/link.fail diff --git a/teshsuite/simdag/platforms/link.lat b/teshsuite/platforms/link.lat similarity index 100% rename from teshsuite/simdag/platforms/link.lat rename to teshsuite/platforms/link.lat diff --git a/teshsuite/simdag/platforms/link_attributes.xml b/teshsuite/platforms/link_attributes.xml similarity index 100% rename from teshsuite/simdag/platforms/link_attributes.xml rename to teshsuite/platforms/link_attributes.xml diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/platforms/one_cluster.xml similarity index 100% rename from teshsuite/simdag/platforms/one_cluster.xml rename to teshsuite/platforms/one_cluster.xml diff --git a/teshsuite/simdag/platforms/one_cluster_multicore.xml b/teshsuite/platforms/one_cluster_multicore.xml similarity index 100% rename from teshsuite/simdag/platforms/one_cluster_multicore.xml rename to teshsuite/platforms/one_cluster_multicore.xml diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/platforms/one_cluster_router_id.xml similarity index 100% rename from teshsuite/simdag/platforms/one_cluster_router_id.xml rename to teshsuite/platforms/one_cluster_router_id.xml diff --git a/teshsuite/simdag/platforms/one_cluster_splitduplex.xml b/teshsuite/platforms/one_cluster_splitduplex.xml similarity index 100% rename from teshsuite/simdag/platforms/one_cluster_splitduplex.xml rename to teshsuite/platforms/one_cluster_splitduplex.xml diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/platforms/properties.xml similarity index 100% rename from teshsuite/simdag/platforms/properties.xml rename to teshsuite/platforms/properties.xml diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/platforms/test_of_is_router.xml similarity index 100% rename from teshsuite/simdag/platforms/test_of_is_router.xml rename to teshsuite/platforms/test_of_is_router.xml diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/platforms/three_hosts_non_symmetric_route.xml similarity index 100% rename from teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml rename to teshsuite/platforms/three_hosts_non_symmetric_route.xml diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/platforms/two_clusters.xml similarity index 100% rename from teshsuite/simdag/platforms/two_clusters.xml rename to teshsuite/platforms/two_clusters.xml diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/platforms/two_clusters_one_name.xml similarity index 100% rename from teshsuite/simdag/platforms/two_clusters_one_name.xml rename to teshsuite/platforms/two_clusters_one_name.xml diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/platforms/two_clusters_router_id.xml similarity index 100% rename from teshsuite/simdag/platforms/two_clusters_router_id.xml rename to teshsuite/platforms/two_clusters_router_id.xml diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/platforms/two_hosts_multi_hop.xml similarity index 100% rename from teshsuite/simdag/platforms/two_hosts_multi_hop.xml rename to teshsuite/platforms/two_hosts_multi_hop.xml diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/platforms/two_hosts_one_link.xml similarity index 100% rename from teshsuite/simdag/platforms/two_hosts_one_link.xml rename to teshsuite/platforms/two_hosts_one_link.xml diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml b/teshsuite/platforms/two_hosts_one_link_splitduplex.xml similarity index 100% rename from teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml rename to teshsuite/platforms/two_hosts_one_link_splitduplex.xml diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt index fd41008ea4..6c750547a8 100644 --- a/teshsuite/s4u/CMakeLists.txt +++ b/teshsuite/s4u/CMakeLists.txt @@ -74,8 +74,8 @@ ADD_TEST(test-help-logs ${TESH_WRAPPER_UNBOXED} ${CMAKE_BINARY_DIR}/teshsuite ADD_TESH(tesh-parser-bypass --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/basic-parsing-test --setenv srcdir=${CMAKE_HOME_DIRECTORY} basic-parsing-test-bypass.tesh) ADD_TESH(tesh-parser-sym-full --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/basic-parsing-test basic-parsing-test-sym-full.tesh) -ADD_TEST(tesh-parser-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK) -ADD_TEST(tesh-parser-full-links02 ${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK) +ADD_TEST(tesh-parser-full-links01 ${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms/two_clusters.xml FULL_LINK) +ADD_TEST(tesh-parser-full-links02 ${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/teshsuite/platforms/two_clusters_one_name.xml FULL_LINK) ADD_TEST(tesh-parser-one-link-g5k ${CMAKE_BINARY_DIR}/teshsuite/s4u/basic-parsing-test/basic-parsing-test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK) set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/activity-lifecycle.hpp PARENT_SCOPE) diff --git a/teshsuite/s4u/basic-link-test/basic-link-test.tesh b/teshsuite/s4u/basic-link-test/basic-link-test.tesh index e733a78a2e..ccc860257f 100644 --- a/teshsuite/s4u/basic-link-test/basic-link-test.tesh +++ b/teshsuite/s4u/basic-link-test/basic-link-test.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ./basic-link-test ${srcdir:=.}/../../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Link count: 12 > [ 0.000000] (0:maestro@) __loopback__: latency = 0.00000, bandwidth = 10000000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000 @@ -15,7 +15,7 @@ $ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=r > [ 0.000000] (0:maestro@) bob_cluster_link_6_DOWN: latency = 0.00005, bandwidth = 125000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_link_6_UP: latency = 0.00005, bandwidth = 125000000.000000 -$ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ./basic-link-test ${srcdir:=.}/../../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (0:maestro@) Link count: 5 > [ 0.000000] (0:maestro@) __loopback__: latency = 0.00000, bandwidth = 10000000000.000000 > [ 0.000000] (0:maestro@) link1: latency = 0.00005, bandwidth = 125000000.000000 diff --git a/teshsuite/s4u/basic-parsing-test/basic-parsing-test-sym-full.tesh b/teshsuite/s4u/basic-parsing-test/basic-parsing-test-sym-full.tesh index c469b7567b..5d2b2f5f32 100644 --- a/teshsuite/s4u/basic-parsing-test/basic-parsing-test-sym-full.tesh +++ b/teshsuite/s4u/basic-parsing-test/basic-parsing-test-sym-full.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/one_cluster_splitduplex.xml FULL_LINK --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/one_cluster_splitduplex.xml FULL_LINK --log=root.fmt=%m%n > Workstation number: 5, link number: 12 > Route between bob3.hamburger.edu and bob3.hamburger.edu > Route size 3 @@ -155,7 +155,7 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/one_cluste > Route latency = 0.000600, route bandwidth = 125000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_clusters.xml FULL_LINK --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/two_clusters.xml FULL_LINK --log=root.fmt=%m%n > Workstation number: 4, link number: 12 > Route between bob1.hamburger.edu and bob1.hamburger.edu > Route size 3 @@ -271,7 +271,7 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_cluste > Route latency = 0.000600, route bandwidth = 125000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_one_link.xml FULL_LINK --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/two_hosts_one_link.xml FULL_LINK --log=root.fmt=%m%n > Workstation number: 2, link number: 2 > Route between alice and alice > Route size 1 @@ -291,7 +291,7 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_ > Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_one_link_splitduplex.xml FULL_LINK --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/two_hosts_one_link_splitduplex.xml FULL_LINK --log=root.fmt=%m%n > Workstation number: 2, link number: 3 > Route between alice and alice > Route size 1 @@ -311,7 +311,7 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_ > Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/Dijkstra.xml FULL_LINK --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/Dijkstra.xml FULL_LINK --log=root.fmt=%m%n > Workstation number: 2, link number: 6 > Route between NODO01 and NODO01 > Route size 1 @@ -333,7 +333,7 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/Dijkstra.x > Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/four_hosts_floyd.xml FULL_LINK --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/four_hosts_floyd.xml FULL_LINK --log=root.fmt=%m%n > Workstation number: 4, link number: 5 > Route between host1 and host1 > Route size 1 diff --git a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh index 19981aad21..ddcabb8112 100644 --- a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh +++ b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh @@ -1,47 +1,47 @@ ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/one_cluster.xml --log=root.fmt=%m%n > Workstation number: 5, link number: 12 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/host_attributes.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/host_attributes.xml --log=root.fmt=%m%n > Workstation number: 5, link number: 1 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/link_attributes.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/link_attributes.xml --log=root.fmt=%m%n > Workstation number: 1, link number: 5 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/three_hosts_non_symmetric_route.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/three_hosts_non_symmetric_route.xml --log=root.fmt=%m%n > Workstation number: 3, link number: 4 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_clusters.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/two_clusters.xml --log=root.fmt=%m%n > Workstation number: 4, link number: 12 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_multi_hop.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/two_hosts_multi_hop.xml --log=root.fmt=%m%n > Workstation number: 2, link number: 4 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_one_link.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/two_hosts_one_link.xml --log=root.fmt=%m%n > Workstation number: 2, link number: 2 ! output sort -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/four_hosts_floyd.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/four_hosts_floyd.xml --log=root.fmt=%m%n > Workstation number: 4, link number: 5 ! output sort $ ${bindir:=.}/basic-parsing-test ${platfdir:=.}/cloud.xml --log=root.fmt=%m%n > Workstation number: 510, link number: 1056 -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/properties.xml --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/properties.xml --log=root.fmt=%m%n > Configuration change: Set 'cpu/optim' to 'TI' > Configuration change: Set 'host/model' to 'compound' > Configuration change: Set 'maxmin/precision' to '0.000010' > Workstation number: 1, link number: 1 -$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/properties.xml --cfg=cpu/optim:TI --log=root.fmt=%m%n +$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../platforms/properties.xml --cfg=cpu/optim:TI --log=root.fmt=%m%n > Configuration change: Set 'cpu/optim' to 'TI' > The custom configuration 'cpu/optim' is already defined by user! > Configuration change: Set 'host/model' to 'compound' diff --git a/teshsuite/s4u/is-router/is-router.tesh b/teshsuite/s4u/is-router/is-router.tesh index 7192988e62..79c469c493 100644 --- a/teshsuite/s4u/is-router/is-router.tesh +++ b/teshsuite/s4u/is-router/is-router.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/is-router ${srcdir:=.}/../../simdag/platforms/test_of_is_router.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" +$ ${bindir:=.}/is-router ${srcdir:=.}/../../platforms/test_of_is_router.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" > Host count: 10, link number: 1 > - Seen: "host01". Type: host > - Seen: "host02". Type: host diff --git a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh deleted file mode 100644 index 4c1d8008a4..0000000000 --- a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh +++ /dev/null @@ -1,11 +0,0 @@ -! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" -> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: zoneRoute gw_src='nod-cluster_router.cluster.us' does name a node. Existing netpoints: -> 'node-1.cluster.us','node-2.cluster.us','node-3.cluster.us','node-4.cluster.us','node-cluster_router.cluster.us','noeud-1.grappe.fr','noeud-2.grappe.fr','noeud-3.grappe.fr','noeud-4.grappe.fr','noeud-grappe_router.grappe.fr' -> [ 0.000000] [0:maestro@] Exiting now. - -! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" -> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: zoneRoute gw_dst='neud-grappe_router.grappe.fr' does name a node. Existing netpoints: -> 'node-1.cluster.us','node-2.cluster.us','node-3.cluster.us','node-4.cluster.us','node-cluster_router.cluster.us','noeud-1.grappe.fr','noeud-2.grappe.fr','noeud-3.grappe.fr','noeud-4.grappe.fr','noeud-grappe_router.grappe.fr' -> [ 0.000000] [0:maestro@] Exiting now. diff --git a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh deleted file mode 100644 index a34a29c930..0000000000 --- a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh +++ /dev/null @@ -1,3 +0,0 @@ -! expect signal SIGABRT -$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/flatifier ../platforms/bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%a@%h]%e%m%n" --log=no_loc -> [ 0.000000] [0:maestro@] The route between alice and bob already exists (Rq: routes are symmetrical by default). diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index c4d8f3d052..761051ee2b 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1048,9 +1048,9 @@ set(CMAKEFILES_TXT teshsuite/mc/CMakeLists.txt teshsuite/models/CMakeLists.txt teshsuite/msg/CMakeLists.txt + teshsuite/platforms/CMakeLists.txt teshsuite/python/CMakeLists.txt teshsuite/s4u/CMakeLists.txt - teshsuite/simdag/CMakeLists.txt teshsuite/smpi/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh index c6bd9dac1c..7c9f633c83 100644 --- a/tools/graphicator/graphicator.tesh +++ b/tools/graphicator/graphicator.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/simdag/platforms/one_cluster.xml test.dot +$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/platforms/one_cluster.xml test.dot $ cat test.dot > graph test { -- 2.20.1