X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4334de1a3cf1c1b19c78fe059b6481a1e53b96c8..727c068cd59669e79c6779f9ff93ec4ac91f7522:/examples/msg/mc/CMakeLists.txt

diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt
index 44751fe502..e6932b4abd 100644
--- a/examples/msg/mc/CMakeLists.txt
+++ b/examples/msg/mc/CMakeLists.txt
@@ -3,38 +3,50 @@ cmake_minimum_required(VERSION 2.6)
 if(HAVE_MC)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test/")
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/chord/")
+
   add_executable(centralized centralized_mutex.c)
   add_executable(bugged1     bugged1.c)
   add_executable(bugged2      bugged2.c)
   add_executable(bugged3	   bugged3.c)
-  add_executable(random_test random_test.c)
+  add_executable(electric_fence	   electric_fence.c)
   add_executable(bugged1_liveness bugged1_liveness.c)
   add_executable(bugged2_liveness bugged2_liveness.c)
-  add_executable(centralized_liveness centralized_liveness.c)
-  add_executable(centralized_liveness_deadlock centralized_liveness_deadlock.c)
-  add_executable(test_snapshot test_snapshot.c)
-  add_executable(test/compare_snapshot test/compare_snapshot.c)
-
+  add_executable(chord/chord_liveness chord/chord_liveness.c)
+  add_executable(test/snapshot_comparison1 test/snapshot_comparison1.c)
+  add_executable(test/snapshot_comparison2 test/snapshot_comparison2.c)
+  add_executable(test/snapshot_comparison3 test/snapshot_comparison3.c)
+  add_executable(test/snapshot_comparison4 test/snapshot_comparison4.c)
+  add_executable(test/snapshot_comparison5 test/snapshot_comparison5.c)
 
-  target_link_libraries(centralized simgrid m )
-  target_link_libraries(bugged1     simgrid m )
-  target_link_libraries(bugged2     simgrid m )
-  target_link_libraries(bugged3     simgrid m )
-  target_link_libraries(random_test     simgrid m )
-  target_link_libraries(bugged1_liveness     simgrid m )
-  target_link_libraries(bugged2_liveness     simgrid m )
-  target_link_libraries(centralized_liveness     simgrid m )
-  target_link_libraries(centralized_liveness_deadlock     simgrid m )
-  target_link_libraries(test_snapshot     simgrid m )
-  target_link_libraries(test/compare_snapshot     simgrid m )
+  target_link_libraries(centralized simgrid )
+  target_link_libraries(bugged1     simgrid )
+  target_link_libraries(bugged2     simgrid )
+  target_link_libraries(bugged3     simgrid )
+  target_link_libraries(electric_fence     simgrid )
+  target_link_libraries(bugged1_liveness     simgrid )
+  target_link_libraries(bugged2_liveness     simgrid )
+  target_link_libraries(chord/chord_liveness     simgrid )
+  target_link_libraries(test/snapshot_comparison1     simgrid )
+  target_link_libraries(test/snapshot_comparison2     simgrid )
+  target_link_libraries(test/snapshot_comparison3     simgrid )
+  target_link_libraries(test/snapshot_comparison4     simgrid )
+  target_link_libraries(test/snapshot_comparison5     simgrid )
 
-endif(HAVE_MC)
+endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/bugged2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/centralized.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_neverjoin.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison1.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison3.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison4.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison5.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -44,10 +56,12 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2_liveness.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged3.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_centralized_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_electric_fence.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_mutex.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_random_test.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/deploy_chord_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/deploy_snapshot_comparison.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_platform.xml
   PARENT_SCOPE
   )
 set(examples_src
@@ -57,27 +71,26 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness_deadlock.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/electric_fence.c
   ${CMAKE_CURRENT_SOURCE_DIR}/centralized_mutex.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/random_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.h
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/test/compare_snapshot.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_liveness.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_liveness.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison1.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison4.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison5.c
   PARENT_SCOPE
   )
 set(bin_files
   ${bin_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/parse_dwarf
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela1_bugged1_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_bugged1_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_bugged2_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_centralized_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged1_liveness
   ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged2_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela_centralized_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/promela_chord_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/promela
   PARENT_SCOPE
   )
 set(txt_files