From e9241a5304d674cb5455525bce4860408496c9c1 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 18 Feb 2016 11:50:23 +0100 Subject: [PATCH 1/1] cleanup XML jungle in teshsuite + some tags do not even exist anymore (foreach, set, ...) + reindent and remove trailing spaces, empty lines, and useless comments --- .../java/sleep_host_off/sleep_host_off_d.xml | 4 +- teshsuite/mc/mutex_handling.xml | 6 +- teshsuite/mc/replay/random_bug.xml | 6 +- teshsuite/msg/get_sender/get_sender_d.xml | 5 +- teshsuite/msg/host_on_off/host_on_off_d.xml | 9 +-- .../host_on_off_processes_d.xml | 4 +- teshsuite/msg/pid/pid_d.xml | 5 +- teshsuite/msg/process/process_d.xml | 9 +-- teshsuite/msg/process_join/process_join_d.xml | 4 +- .../task_destroy_cancel_d.xml | 9 +-- .../network/mxn/platform_4p_1switch.xml | 74 +++++-------------- .../simdag/network/p2p/platform_2p_1bb.xml | 27 +++---- .../simdag/network/p2p/platform_2p_1fl.xml | 20 +++-- .../simdag/network/p2p/platform_2p_1sl.xml | 20 +++-- .../network/p2p/platform_2p_1switch.xml | 20 ++--- teshsuite/simdag/partask/platform_2p_1sl.xml | 22 +++--- .../simdag/partask/platform_2p_1sl_hetero.xml | 23 +++--- teshsuite/simdag/platforms/CMakeLists.txt | 6 -- .../platforms/basic_parsing_test_failing.tesh | 4 - .../platforms/bogus_disk_attachment.tesh | 2 +- .../platforms/bogus_disk_attachment.xml | 13 +--- .../platforms/bogus_missing_dst_gateway.xml | 11 ++- .../platforms/bogus_missing_gateway.tesh | 4 +- .../platforms/bogus_missing_src_gateway.xml | 11 ++- .../platforms/bogus_two_hosts_asymetric-2.xml | 30 +++----- .../platforms/bogus_two_hosts_asymetric.xml | 25 +++---- teshsuite/simdag/platforms/clusterA.xml | 5 +- .../platforms/four_hosts_Dijkstra_ns3.xml | 46 +++++------- .../simdag/platforms/four_hosts_floyd.xml | 46 ++++-------- .../simdag/platforms/four_hosts_floyd_bis.xml | 62 ++++++---------- .../simdag/platforms/four_hosts_floyd_ns3.xml | 39 ++++------ teshsuite/simdag/platforms/one_cluster.xml | 5 +- .../simdag/platforms/one_cluster_file.xml | 8 +- .../simdag/platforms/one_cluster_foreach.xml | 24 ------ .../platforms/one_cluster_fullduplex.xml | 6 +- .../platforms/one_cluster_multicore.xml | 4 +- .../simdag/platforms/one_cluster_one_host.xml | 19 ----- .../platforms/one_cluster_one_host_random.xml | 19 ----- .../one_cluster_properties_foreach.xml | 14 ---- .../one_cluster_properties_override.xml | 18 ----- .../platforms/one_cluster_router_id.xml | 5 +- teshsuite/simdag/platforms/one_host.xml | 4 +- .../platforms/one_host_availability.xml | 7 +- .../simdag/platforms/one_host_properties.xml | 4 +- .../simdag/platforms/one_host_state_file.xml | 7 +- .../simdag/platforms/one_host_state_off.xml | 7 +- .../simdag/platforms/one_host_state_on.xml | 7 +- .../simdag/platforms/one_host_trace_file.xml | 6 +- .../platforms/one_host_trace_inside.xml | 3 +- .../platforms/one_link_availability.xml | 7 +- .../simdag/platforms/one_link_fatpipe.xml | 9 +-- .../simdag/platforms/one_link_shared.xml | 8 +- .../simdag/platforms/one_link_state_file.xml | 9 +-- .../simdag/platforms/platform_include.xml | 8 +- teshsuite/simdag/platforms/properties.xml | 22 +++--- teshsuite/simdag/platforms/random.xml | 33 +++------ teshsuite/simdag/platforms/route_override.xml | 35 --------- .../simdag/platforms/test_of_is_router.xml | 56 +++++++------- .../three_hosts_non_symmetric_route.xml | 43 ++++------- teshsuite/simdag/platforms/two_clusters.xml | 33 +++------ .../platforms/two_clusters_one_name.xml | 20 ++--- .../platforms/two_clusters_router_id.xml | 41 ++++------ .../platforms/two_clusters_symmetric.xml | 34 ++++----- .../simdag/platforms/two_hosts_multi_hop.xml | 29 +++----- .../simdag/platforms/two_hosts_one_link.xml | 22 +++--- .../two_hosts_one_link_fullduplex.xml | 25 ++----- .../two_hosts_one_link_symmetrical.xml | 27 +++---- .../simix/stack_overflow/stack_overflow.xml | 6 +- .../stack_overflow_platform.xml | 3 - tools/cmake/DefinePackages.cmake | 14 +--- 70 files changed, 398 insertions(+), 824 deletions(-) delete mode 100644 teshsuite/simdag/platforms/one_cluster_foreach.xml delete mode 100644 teshsuite/simdag/platforms/one_cluster_one_host.xml delete mode 100644 teshsuite/simdag/platforms/one_cluster_one_host_random.xml delete mode 100644 teshsuite/simdag/platforms/one_cluster_properties_foreach.xml delete mode 100644 teshsuite/simdag/platforms/one_cluster_properties_override.xml delete mode 100644 teshsuite/simdag/platforms/route_override.xml diff --git a/teshsuite/java/sleep_host_off/sleep_host_off_d.xml b/teshsuite/java/sleep_host_off/sleep_host_off_d.xml index 57937f4fa4..5394f0b14c 100644 --- a/teshsuite/java/sleep_host_off/sleep_host_off_d.xml +++ b/teshsuite/java/sleep_host_off/sleep_host_off_d.xml @@ -1,7 +1,5 @@ - - - + diff --git a/teshsuite/mc/mutex_handling.xml b/teshsuite/mc/mutex_handling.xml index 57cbaea917..7f60f93675 100644 --- a/teshsuite/mc/mutex_handling.xml +++ b/teshsuite/mc/mutex_handling.xml @@ -1,10 +1,9 @@ - - + - + @@ -13,5 +12,4 @@ - diff --git a/teshsuite/mc/replay/random_bug.xml b/teshsuite/mc/replay/random_bug.xml index e2f332c0ca..d9ecb0292f 100644 --- a/teshsuite/mc/replay/random_bug.xml +++ b/teshsuite/mc/replay/random_bug.xml @@ -1,7 +1,5 @@ - - - - + + diff --git a/teshsuite/msg/get_sender/get_sender_d.xml b/teshsuite/msg/get_sender/get_sender_d.xml index 703b135765..2437d64f05 100644 --- a/teshsuite/msg/get_sender/get_sender_d.xml +++ b/teshsuite/msg/get_sender/get_sender_d.xml @@ -1,9 +1,6 @@ - - - - + diff --git a/teshsuite/msg/host_on_off/host_on_off_d.xml b/teshsuite/msg/host_on_off/host_on_off_d.xml index 5d99c6dfa5..8ff8862c63 100644 --- a/teshsuite/msg/host_on_off/host_on_off_d.xml +++ b/teshsuite/msg/host_on_off/host_on_off_d.xml @@ -1,11 +1,6 @@ - - - - - - - + + diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml b/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml index 6726755c9c..a9a6559925 100644 --- a/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml +++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml @@ -1,7 +1,5 @@ - - - + diff --git a/teshsuite/msg/pid/pid_d.xml b/teshsuite/msg/pid/pid_d.xml index 6456b754ce..e2ae5a4160 100644 --- a/teshsuite/msg/pid/pid_d.xml +++ b/teshsuite/msg/pid/pid_d.xml @@ -1,11 +1,8 @@ - - - - + diff --git a/teshsuite/msg/process/process_d.xml b/teshsuite/msg/process/process_d.xml index cafca99a7f..2b4aabc675 100644 --- a/teshsuite/msg/process/process_d.xml +++ b/teshsuite/msg/process/process_d.xml @@ -1,11 +1,6 @@ - - - - - - - + + diff --git a/teshsuite/msg/process_join/process_join_d.xml b/teshsuite/msg/process_join/process_join_d.xml index e30be8aa6b..ea69ac8dc1 100644 --- a/teshsuite/msg/process_join/process_join_d.xml +++ b/teshsuite/msg/process_join/process_join_d.xml @@ -1,7 +1,5 @@ - - - + diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml index 5d99c6dfa5..8ff8862c63 100644 --- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml +++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml @@ -1,11 +1,6 @@ - - - - - - - + + diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml index 92fe4c038d..57ab438eed 100644 --- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml +++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml @@ -1,57 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml index ba2146b438..ef7632ae1a 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml @@ -1,24 +1,15 @@ - - - - - + + + - + - + - - - - - + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml index 84860e57d9..84bf34da26 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml @@ -1,14 +1,12 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml index b437cc8b1f..53e2f8aae2 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml @@ -1,14 +1,12 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml index a3ca6c3cb2..bd1e546d71 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml @@ -1,20 +1,14 @@ - - - - - + + + - - - + + + - - - - - + diff --git a/teshsuite/simdag/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml index fc1d628730..771d797818 100644 --- a/teshsuite/simdag/partask/platform_2p_1sl.xml +++ b/teshsuite/simdag/partask/platform_2p_1sl.xml @@ -1,16 +1,12 @@ - - - - - - - - - - - - - + + + + + + + + + diff --git a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml index 2c386dec13..55805e5b32 100644 --- a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml +++ b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml @@ -1,17 +1,12 @@ - - - - - - - - - - - - - + + + + + + + + + diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index 69bc2dc1a4..73140d103e 100644 --- a/teshsuite/simdag/platforms/CMakeLists.txt +++ b/teshsuite/simdag/platforms/CMakeLists.txt @@ -47,12 +47,7 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_file.xml ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_foreach.xml ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_one_host_random.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_one_host.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_properties_foreach.xml - ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_properties_override.xml ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml ${CMAKE_CURRENT_SOURCE_DIR}/one_host_availability.xml @@ -70,7 +65,6 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml ${CMAKE_CURRENT_SOURCE_DIR}/random.xml - ${CMAKE_CURRENT_SOURCE_DIR}/route_override.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 diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh index e64f4bbcc1..8e249d2c78 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh @@ -1,7 +1,3 @@ -! output sort -$ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_cluster_properties_override.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms' - ! output sort $ ${bindir:=.}/simdag/platforms/basic_parsing_test --cfg=path:simdag/platforms one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'path' to 'simdag/platforms' diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh index c80744625e..26bb0d9bd1 100644 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.tesh +++ b/teshsuite/simdag/platforms/bogus_disk_attachment.tesh @@ -1,5 +1,5 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_disk_attachment.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at bogus_disk_attachment.xml:26: Unable to attach storage cdisk: host plouf doesn't exist. +> [ 0.000000] [0:maestro@] Parse error at bogus_disk_attachment.xml:21: Unable to attach storage cdisk: host plouf doesn't exist. > [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml index 3560666d81..b7c85a241f 100644 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml +++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml @@ -1,15 +1,11 @@ - - - - - +It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh --> + + + - @@ -18,7 +14,6 @@ See bogus_disk_attachment.tesh --> - diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml index 19387a0397..2696ab2681 100644 --- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml +++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml @@ -2,16 +2,19 @@ - - + + - + - + diff --git a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh index 0237bad818..c46f743e2b 100644 --- a/teshsuite/simdag/platforms/bogus_missing_gateway.tesh +++ b/teshsuite/simdag/platforms/bogus_missing_gateway.tesh @@ -1,11 +1,11 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at bogus_missing_src_gateway.xml:16: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr" +> [ 0.000000] [0:maestro@] Parse error at bogus_missing_src_gateway.xml:19: gw_src="nod-cluster_router.cluster.us" not found for ASroute from "us" to "fr" > [ 0.000000] [0:maestro@] Exiting now ! expect signal SIGABRT $ ${bindir:=.}/flatifier bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at bogus_missing_dst_gateway.xml:16: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr" +> [ 0.000000] [0:maestro@] Parse error at bogus_missing_dst_gateway.xml:19: gw_dst="neud-grappe_router.grappe.fr" not found for ASroute from "us" to "fr" > [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml index bfc655ce99..258965cd38 100644 --- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml +++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml @@ -3,15 +3,18 @@ - - + + - + - + diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml index 3312ba1f7a..10c9d3b3c3 100644 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml @@ -1,29 +1,21 @@ - +It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) --> - - - - - - - - - - - + + - - - + + + + - - + + + + diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml index 5218783dd6..83c23c3873 100644 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml @@ -1,27 +1,20 @@ - +It is used to check that this (bogus) file is detected as is (see two_hosts_asymetric.tesh) --> - - - - + + + + - - - - - - - + - - + + + diff --git a/teshsuite/simdag/platforms/clusterA.xml b/teshsuite/simdag/platforms/clusterA.xml index ab96c62046..ad7bcdf747 100644 --- a/teshsuite/simdag/platforms/clusterA.xml +++ b/teshsuite/simdag/platforms/clusterA.xml @@ -1,5 +1,4 @@ - + diff --git a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml index 6b7aa4a36c..58ca33404b 100644 --- a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml +++ b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml @@ -1,32 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml index baddb55d04..b9054e2e18 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml @@ -1,34 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml index f473bdf4da..c93c4e25e6 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml @@ -1,45 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml index 2b91928090..bf2c664391 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml @@ -1,30 +1,19 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + + diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml index bc98da5d81..49a4694c0b 100644 --- a/teshsuite/simdag/platforms/one_cluster.xml +++ b/teshsuite/simdag/platforms/one_cluster.xml @@ -2,8 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster_file.xml b/teshsuite/simdag/platforms/one_cluster_file.xml index 9b1da8041f..5dc819040a 100644 --- a/teshsuite/simdag/platforms/one_cluster_file.xml +++ b/teshsuite/simdag/platforms/one_cluster_file.xml @@ -2,10 +2,8 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster_foreach.xml b/teshsuite/simdag/platforms/one_cluster_foreach.xml deleted file mode 100644 index ee1efe1262..0000000000 --- a/teshsuite/simdag/platforms/one_cluster_foreach.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml index 0c1d189a6c..543f7f7fdf 100644 --- a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml +++ b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml @@ -2,9 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster_multicore.xml b/teshsuite/simdag/platforms/one_cluster_multicore.xml index 7019743258..589aa15f40 100644 --- a/teshsuite/simdag/platforms/one_cluster_multicore.xml +++ b/teshsuite/simdag/platforms/one_cluster_multicore.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster_one_host.xml b/teshsuite/simdag/platforms/one_cluster_one_host.xml deleted file mode 100644 index 36e32af539..0000000000 --- a/teshsuite/simdag/platforms/one_cluster_one_host.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml b/teshsuite/simdag/platforms/one_cluster_one_host_random.xml deleted file mode 100644 index e1cae6d976..0000000000 --- a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml b/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml deleted file mode 100644 index c1eee1eef0..0000000000 --- a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_cluster_properties_override.xml b/teshsuite/simdag/platforms/one_cluster_properties_override.xml deleted file mode 100644 index 2984947608..0000000000 --- a/teshsuite/simdag/platforms/one_cluster_properties_override.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml index 8c71e60605..5111016b42 100644 --- a/teshsuite/simdag/platforms/one_cluster_router_id.xml +++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml @@ -2,8 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml index dd3b87f6e4..9d07959756 100644 --- a/teshsuite/simdag/platforms/one_host.xml +++ b/teshsuite/simdag/platforms/one_host.xml @@ -1,7 +1,7 @@ - - + + diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml index 221276b212..7845c7dbfa 100644 --- a/teshsuite/simdag/platforms/one_host_availability.xml +++ b/teshsuite/simdag/platforms/one_host_availability.xml @@ -1,8 +1,7 @@ - - - + + + diff --git a/teshsuite/simdag/platforms/one_host_properties.xml b/teshsuite/simdag/platforms/one_host_properties.xml index 89b2fe23d7..3691ccd8ef 100644 --- a/teshsuite/simdag/platforms/one_host_properties.xml +++ b/teshsuite/simdag/platforms/one_host_properties.xml @@ -1,11 +1,11 @@ - + - + diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml index 6a2ae11264..b2402d93d3 100644 --- a/teshsuite/simdag/platforms/one_host_state_file.xml +++ b/teshsuite/simdag/platforms/one_host_state_file.xml @@ -1,8 +1,7 @@ - - - + + + diff --git a/teshsuite/simdag/platforms/one_host_state_off.xml b/teshsuite/simdag/platforms/one_host_state_off.xml index 447b656117..07aa26be76 100644 --- a/teshsuite/simdag/platforms/one_host_state_off.xml +++ b/teshsuite/simdag/platforms/one_host_state_off.xml @@ -1,8 +1,7 @@ - - - + + + diff --git a/teshsuite/simdag/platforms/one_host_state_on.xml b/teshsuite/simdag/platforms/one_host_state_on.xml index 2b94e24ff4..115e742eec 100644 --- a/teshsuite/simdag/platforms/one_host_state_on.xml +++ b/teshsuite/simdag/platforms/one_host_state_on.xml @@ -1,8 +1,7 @@ - - - + + + diff --git a/teshsuite/simdag/platforms/one_host_trace_file.xml b/teshsuite/simdag/platforms/one_host_trace_file.xml index 3b5f62dc33..081295ef37 100644 --- a/teshsuite/simdag/platforms/one_host_trace_file.xml +++ b/teshsuite/simdag/platforms/one_host_trace_file.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/teshsuite/simdag/platforms/one_host_trace_inside.xml b/teshsuite/simdag/platforms/one_host_trace_inside.xml index ac92ef50a3..b558d30471 100644 --- a/teshsuite/simdag/platforms/one_host_trace_inside.xml +++ b/teshsuite/simdag/platforms/one_host_trace_inside.xml @@ -3,7 +3,7 @@ - + 0.0 1.0 11.0 0.5 @@ -11,5 +11,4 @@ - diff --git a/teshsuite/simdag/platforms/one_link_availability.xml b/teshsuite/simdag/platforms/one_link_availability.xml index 32ec7705d0..85dd598c70 100644 --- a/teshsuite/simdag/platforms/one_link_availability.xml +++ b/teshsuite/simdag/platforms/one_link_availability.xml @@ -1,9 +1,8 @@ - + - - + + diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml index c9ca8f2c1f..103a5401f5 100644 --- a/teshsuite/simdag/platforms/one_link_fatpipe.xml +++ b/teshsuite/simdag/platforms/one_link_fatpipe.xml @@ -1,9 +1,8 @@ - - - - + + + + diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml index a13f343f6b..1b427f0a1a 100644 --- a/teshsuite/simdag/platforms/one_link_shared.xml +++ b/teshsuite/simdag/platforms/one_link_shared.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/teshsuite/simdag/platforms/one_link_state_file.xml b/teshsuite/simdag/platforms/one_link_state_file.xml index dc50e88346..7eeea58056 100644 --- a/teshsuite/simdag/platforms/one_link_state_file.xml +++ b/teshsuite/simdag/platforms/one_link_state_file.xml @@ -1,9 +1,8 @@ - - - - + + + + diff --git a/teshsuite/simdag/platforms/platform_include.xml b/teshsuite/simdag/platforms/platform_include.xml index 326429e86f..1c172ee265 100644 --- a/teshsuite/simdag/platforms/platform_include.xml +++ b/teshsuite/simdag/platforms/platform_include.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml index 17c9151f84..a15bf7a113 100644 --- a/teshsuite/simdag/platforms/properties.xml +++ b/teshsuite/simdag/platforms/properties.xml @@ -1,16 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/random.xml b/teshsuite/simdag/platforms/random.xml index 56ef909b6d..573c4246f3 100644 --- a/teshsuite/simdag/platforms/random.xml +++ b/teshsuite/simdag/platforms/random.xml @@ -26,40 +26,27 @@ - + - - + /> + - - - + /> + + diff --git a/teshsuite/simdag/platforms/route_override.xml b/teshsuite/simdag/platforms/route_override.xml deleted file mode 100644 index 69495eae2d..0000000000 --- a/teshsuite/simdag/platforms/route_override.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml index 9468a28c41..3f5d239c2a 100644 --- a/teshsuite/simdag/platforms/test_of_is_router.xml +++ b/teshsuite/simdag/platforms/test_of_is_router.xml @@ -1,33 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml index 8e1428a5ff..e4e0706fd8 100644 --- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml +++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml @@ -1,31 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml index 30d27301e2..e40b830587 100644 --- a/teshsuite/simdag/platforms/two_clusters.xml +++ b/teshsuite/simdag/platforms/two_clusters.xml @@ -1,26 +1,17 @@ - - - - - - - - - + + + + - - - + + + - - - + + diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml index 92b381cad5..0625fd317f 100644 --- a/teshsuite/simdag/platforms/two_clusters_one_name.xml +++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml @@ -2,23 +2,17 @@ - - - - - + - - - - + diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml index f5559a1e7b..7c0e117883 100644 --- a/teshsuite/simdag/platforms/two_clusters_router_id.xml +++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml @@ -1,32 +1,19 @@ - - - - - - - - - + + + + - - - + + + - - - - - - - + + + + + diff --git a/teshsuite/simdag/platforms/two_clusters_symmetric.xml b/teshsuite/simdag/platforms/two_clusters_symmetric.xml index 4f29322845..9afb8cfc7a 100644 --- a/teshsuite/simdag/platforms/two_clusters_symmetric.xml +++ b/teshsuite/simdag/platforms/two_clusters_symmetric.xml @@ -1,26 +1,18 @@ - - - - - - - - + + + + - - - - - - + + + + + + diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml index 63baa3acdd..5048e04023 100644 --- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml +++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml @@ -1,21 +1,14 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml index ad75daf054..6140f0ba91 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml @@ -1,16 +1,12 @@ - - - - - - - - - - - - - + + + + + + + + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml index 5e7912a991..25c944cce6 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml @@ -1,22 +1,13 @@ - - - - - - - + + + - - - - - - - + - - + + + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml index f4fdd24b63..a0c5550fb3 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml @@ -1,21 +1,14 @@ - - - - - - - - - - - - - - - + + + - - + + + + + + + diff --git a/teshsuite/simix/stack_overflow/stack_overflow.xml b/teshsuite/simix/stack_overflow/stack_overflow.xml index 65b93e4952..ea69ac8dc1 100644 --- a/teshsuite/simix/stack_overflow/stack_overflow.xml +++ b/teshsuite/simix/stack_overflow/stack_overflow.xml @@ -1,9 +1,5 @@ - - - - - + diff --git a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml b/teshsuite/simix/stack_overflow/stack_overflow_platform.xml index 2ea65afed0..72c5c0587c 100644 --- a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml +++ b/teshsuite/simix/stack_overflow/stack_overflow_platform.xml @@ -1,10 +1,7 @@ - - - diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 2f47778443..e48cf7904f 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -764,12 +764,14 @@ endif() ### Simgrid Lib sources set(simgrid_sources ${BINDINGS_SRC} - ${S4U_SRC} + ${MC_SRC_BASE} ${MSG_SRC} + ${S4U_SRC} ${SIMDAG_SRC} ${SIMGRID_SRC} ${SIMIX_SRC} ${SURF_SRC} + ${TRACING_SRC} ${XBT_SRC} ) @@ -792,16 +794,6 @@ if(enable_smpi) ) endif() -set(simgrid_sources - ${simgrid_sources} - ${TRACING_SRC} - ) - -set(simgrid_sources - ${simgrid_sources} - ${MC_SRC_BASE} - ) - if(HAVE_MC) set(simgrid_sources ${simgrid_sources} -- 2.20.1