Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
resolve cmakelists conflict
[simgrid.git] / examples / msg / mc / CMakeLists.txt
index 7f08a4c..784334c 100644 (file)
@@ -14,33 +14,39 @@ if(HAVE_MC)
   add_executable(bugged1_liveness bugged1_liveness.c)
   add_executable(bugged2_liveness bugged2_liveness.c)
   add_executable(chord/chord_liveness chord/chord_liveness.c)
-  add_executable(test/snapshot_comparison_liveness1 test/snapshot_comparison_liveness1.c)
-  add_executable(test/snapshot_comparison_liveness2 test/snapshot_comparison_liveness2.c)
-  add_executable(test/snapshot_comparison_liveness3 test/snapshot_comparison_liveness3.c)
-  add_executable(test/snapshot_comparison_liveness4 test/snapshot_comparison_liveness4.c)
-  add_executable(test/snapshot_comparison_liveness5 test/snapshot_comparison_liveness5.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 )
-  target_link_libraries(bugged1     simgrid )
-  target_link_libraries(bugged2     simgrid )
-  target_link_libraries(bugged3     simgrid )
-  target_link_libraries(random_test     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_comparison_liveness1     simgrid m )
-  target_link_libraries(test/snapshot_comparison_liveness2     simgrid m )
-  target_link_libraries(test/snapshot_comparison_liveness3     simgrid m )
-  target_link_libraries(test/snapshot_comparison_liveness4     simgrid m )
-  target_link_libraries(test/snapshot_comparison_liveness5     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(random_test     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()
 
 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
@@ -55,6 +61,7 @@ set(xml_files
   ${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
@@ -70,11 +77,11 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.h
   ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_liveness.c
   ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_liveness.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_liveness1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_liveness2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_liveness3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_liveness4.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_liveness5.c
+  ${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