Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / simdag / platforms / CMakeLists.txt

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index e4ccbac..3a95a07 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -27,40 +27,26 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_Dijkstra_ns3.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_bis.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_ns3.xml
   ${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_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.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
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_properties.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_file.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_off.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_on.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_file.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_inside.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_availability.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_fatpipe.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_shared.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_link_state_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/random.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_symmetric.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}/bogus_two_hosts_asymetric-2.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_fullduplex.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link_symmetrical.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_one_link.xml
@@ -80,13 +66,10 @@ set(teshsuite_src
   PARENT_SCOPE)
 set(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob0_availability_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob0_state_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob2_availability_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob2_state_file.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/bob.fail
+  ${CMAKE_CURRENT_SOURCE_DIR}/carol.fail
   ${CMAKE_CURRENT_SOURCE_DIR}/bob.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/link1.bw
-  ${CMAKE_CURRENT_SOURCE_DIR}/link1.fail
-  ${CMAKE_CURRENT_SOURCE_DIR}/link1.lat
+  ${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)