From 0dc963c8af0781cbc354f2918c107a83b326dde4 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 25 Mar 2016 10:41:52 +0100 Subject: [PATCH 1/1] move these traces with the others --- examples/msg/CMakeLists.txt | 4 ---- examples/platforms/small_platform_with_failures.xml | 12 ++++++------ .../{msg => platforms/trace}/bourassa_state.trace | 0 examples/{msg => platforms/trace}/fafard_state.trace | 0 .../{msg => platforms/trace}/ginette_state.trace | 0 .../{msg => platforms/trace}/jupiter_state.trace | 0 examples/{msg => platforms/trace}/link3_state.trace | 0 examples/{msg => platforms/trace}/link4_state.trace | 0 tools/cmake/DefinePackages.cmake | 6 ++++++ 9 files changed, 12 insertions(+), 10 deletions(-) rename examples/{msg => platforms/trace}/bourassa_state.trace (100%) rename examples/{msg => platforms/trace}/fafard_state.trace (100%) rename examples/{msg => platforms/trace}/ginette_state.trace (100%) rename examples/{msg => platforms/trace}/jupiter_state.trace (100%) rename examples/{msg => platforms/trace}/link3_state.trace (100%) rename examples/{msg => platforms/trace}/link4_state.trace (100%) diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index e74bc9d133..9aa8aa113e 100644 --- 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 47b0cceda6..7840074058 100644 --- a/examples/platforms/small_platform_with_failures.xml +++ b/examples/platforms/small_platform_with_failures.xml @@ -3,15 +3,15 @@ - - - - + + + + - - + + 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 1e92343116..c6bf6eb8f0 100644 --- 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 -- 2.20.1