X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12cd6f226a676a2dbd827724f0ed8264f5868ea8..71a5eb97d50eadd3edf7623d21dd3c1c4e235971:/examples/msg/mc/CMakeLists.txt diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt index 845088eade..fb51f84e29 100644 --- a/examples/msg/mc/CMakeLists.txt +++ b/examples/msg/mc/CMakeLists.txt @@ -3,9 +3,6 @@ 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) @@ -13,12 +10,6 @@ if(HAVE_MC) add_executable(electric_fence electric_fence.c) add_executable(bugged1_liveness bugged1_liveness.c) add_executable(bugged2_liveness bugged2_liveness.c) - add_executable(chord/chord chord/chord.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 ) @@ -26,13 +17,20 @@ if(HAVE_MC) 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 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 ) + target_link_libraries(bugged2_liveness simgrid ) + + if(HAVE_C_STACK_CLEANER) + add_executable(bugged1_liveness_cleaner_on bugged1_liveness.c ) + add_executable(bugged1_liveness_cleaner_off bugged1_liveness.c ) + + target_link_libraries(bugged1_liveness_cleaner_on simgrid ) + target_link_libraries(bugged1_liveness_cleaner_off simgrid ) + + set_target_properties(bugged1_liveness_cleaner_on + PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fstack-cleaner") + set_target_properties(bugged1_liveness_cleaner_off + PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fno-stack-cleaner") + endif() endif() @@ -41,19 +39,16 @@ set(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}/bugged1_liveness_visited.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_sparse.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_visited_sparse.tesh ${CMAKE_CURRENT_SOURCE_DIR}/centralized.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_neverjoin.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_neverjoin_timeout_visited.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 ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1_liveness.xml + ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1_liveness_visited.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2_liveness.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2.xml @@ -61,9 +56,6 @@ set(xml_files ${CMAKE_CURRENT_SOURCE_DIR}/deploy_electric_fence.xml ${CMAKE_CURRENT_SOURCE_DIR}/deploy_mutex.xml ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml - ${CMAKE_CURRENT_SOURCE_DIR}/chord/deploy_chord4.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test/deploy_snapshot_comparison.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_platform.xml PARENT_SCOPE ) set(examples_src @@ -77,20 +69,13 @@ set(examples_src ${CMAKE_CURRENT_SOURCE_DIR}/centralized_mutex.c ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.h ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.h - ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord.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 ${bin_files} - ${CMAKE_CURRENT_SOURCE_DIR}/parse_dwarf ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged1_liveness ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged2_liveness - ${CMAKE_CURRENT_SOURCE_DIR}/test/promela + ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_stack_cleaner PARENT_SCOPE ) set(txt_files