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
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
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
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
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
-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)
--- /dev/null
+! 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.
--- /dev/null
+! 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).
static void dump_hosts()
{
- std::vector<sg4::Host*> hosts = sg4::Engine::get_instance()->get_all_hosts();
+ std::vector<sg4::Host*> 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<sg4::Link*> 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(" <link id=\"");
- std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->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 {
static void dump_routers()
{
- std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
- sg4::Engine::get_instance()->get_all_netpoints();
+ std::vector<simgrid::kernel::routing::NetPoint*> 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();
static void dump_routes()
{
- std::vector<sg4::Host*> hosts = sg4::Engine::get_instance()->get_all_hosts();
+ std::vector<sg4::Host*> 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<simgrid::kernel::routing::NetPoint*> netpoints =
- sg4::Engine::get_instance()->get_all_netpoints();
+ std::vector<simgrid::kernel::routing::NetPoint*> 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();
#!/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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </route>
> </AS>
> </platform>
-$ ${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"
> <?xml version='1.0'?>
> <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
> <platform version="4">
> </route>
> </AS>
> </platform>
-
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)
#!/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
> [ 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
#!/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
> 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
> 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
> 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
> 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
> 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
! 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'
#!/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
+++ /dev/null
-! 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.
+++ /dev/null
-! 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).
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
#!/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 {
