move these traces with the others

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index e74bc9d..9aa8aa1 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -9,10 +9,6 @@ foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht
   set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
 endforeach()
 
-foreach(file bourassa fafard ginette jupiter link3 link4)
-  set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}_state.trace)
-endforeach()
-
 set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p0.txt

diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_with_failures.xml
index 47b0cce..7840074 100644 (file)
--- a/examples/platforms/small_platform_with_failures.xml
+++ b/examples/platforms/small_platform_with_failures.xml
@@ -3,15 +3,15 @@
 <platform version="4">
   <AS  id="AS0"  routing="Full">
     <host id="Tremblay" speed="25Mf"/>
-    <host id="Jupiter" speed="25Mf" state_file="jupiter_state.trace"/>
-    <host id="Fafard" speed="25Mf" state_file="fafard_state.trace" />
-    <host id="Ginette" speed="25Mf" state_file="ginette_state.trace"/>
-    <host id="Bourassa" speed="25Mf"state_file="bourassa_state.trace"/>
+    <host id="Jupiter" speed="25Mf" state_file="trace/jupiter_state.trace"/>
+    <host id="Fafard" speed="25Mf" state_file="trace/fafard_state.trace" />
+    <host id="Ginette" speed="25Mf" state_file="trace/ginette_state.trace"/>
+    <host id="Bourassa" speed="25Mf"state_file="trace/bourassa_state.trace"/>
 
     <link id="1" bandwidth="1MBps" latency="0"/>
     <link id="2" bandwidth="1MBps" latency="0"/>
-    <link id="3" bandwidth="1MBps" latency="0" state_file="link3_state.trace" />
-    <link id="4" bandwidth="1MBps" latency="0" state_file="link4_state.trace" />
+    <link id="3" bandwidth="1MBps" latency="0" state_file="trace/link3_state.trace" />
+    <link id="4" bandwidth="1MBps" latency="0" state_file="trace/link4_state.trace" />
     <link id="5" bandwidth="1MBps" latency="0"/>
     <link id="6" bandwidth="1MBps" latency="0"/>
     <link id="7" bandwidth="1MBps" latency="0"/>

diff --git a/examples/msg/bourassa_state.trace b/examples/platforms/trace/bourassa_state.trace
similarity index 100%
rename from examples/msg/bourassa_state.trace
rename to examples/platforms/trace/bourassa_state.trace

diff --git a/examples/msg/fafard_state.trace b/examples/platforms/trace/fafard_state.trace
similarity index 100%
rename from examples/msg/fafard_state.trace
rename to examples/platforms/trace/fafard_state.trace

diff --git a/examples/msg/ginette_state.trace b/examples/platforms/trace/ginette_state.trace
similarity index 100%
rename from examples/msg/ginette_state.trace
rename to examples/platforms/trace/ginette_state.trace

diff --git a/examples/msg/jupiter_state.trace b/examples/platforms/trace/jupiter_state.trace
similarity index 100%
rename from examples/msg/jupiter_state.trace
rename to examples/platforms/trace/jupiter_state.trace

diff --git a/examples/msg/link3_state.trace b/examples/platforms/trace/link3_state.trace
similarity index 100%
rename from examples/msg/link3_state.trace
rename to examples/platforms/trace/link3_state.trace

diff --git a/examples/msg/link4_state.trace b/examples/platforms/trace/link4_state.trace
similarity index 100%
rename from examples/msg/link4_state.trace
rename to examples/platforms/trace/link4_state.trace

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1e92343..c6bf6eb 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1087,9 +1087,15 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/optorsim/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
+  examples/platforms/trace/bourassa_state.trace
+  examples/platforms/trace/fafard_state.trace
   examples/platforms/trace/faulty_host.trace
+  examples/platforms/trace/ginette_speed.trace
   examples/platforms/trace/jupiter_speed.trace
+  examples/platforms/trace/jupiter_state.trace
   examples/platforms/trace/link1_avail.trace
+  examples/platforms/trace/link3_state.trace
+  examples/platforms/trace/link4_state.trace
   examples/platforms/trace/linkBandwidth7.bw
   examples/platforms/trace/trace_A_failure.txt
   examples/platforms/trace/trace_A.txt