-add_executable (with_mutex_handling mutex_handling.c)
-target_link_libraries(with_mutex_handling simgrid)
-
-add_executable (without_mutex_handling mutex_handling.c)
-target_link_libraries(without_mutex_handling simgrid)
-set_target_properties(without_mutex_handling PROPERTIES COMPILE_FLAGS -DDISABLE_THE_MUTEX=1)
-
-set(tesh_files
- ${tesh_files}
- ${CMAKE_CURRENT_SOURCE_DIR}/with_mutex_handling.tesh
- ${CMAKE_CURRENT_SOURCE_DIR}/without_mutex_handling.tesh
- PARENT_SCOPE)
-set(testsuite_src
- ${testsuite_src}
- ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.c
- PARENT_SCOPE)
-set(xml_files
- ${xml_files}
- ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.xml
- PARENT_SCOPE)
+
+foreach(x random-bug mutex-handling)
+
+ if(NOT DEFINED ${x}_sources)
+ set(${x}_sources ${x}/${x}.cpp)
+ endif()
+
+ if(NOT DEFINED ${x}_disable)
+ add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp)
+ target_link_libraries(${x} simgrid)
+ set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+ set_property(TARGET ${x} APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
+ target_compile_options(${x} PRIVATE ${CMAKE_C_DEBUG_FLAGS})
+ add_dependencies(tests-mc ${x})
+ endif()
+
+ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+
+ foreach(file ${${x}_sources})
+ set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+ endforeach()
+
+ unset(${x}_sources)
+ unset(${x}_disable)
+
+endforeach()
+
+add_executable (without-mutex-handling EXCLUDE_FROM_ALL mutex-handling/mutex-handling.cpp)
+target_link_libraries(without-mutex-handling simgrid)
+set_target_properties(without-mutex-handling PROPERTIES COMPILE_FLAGS -DDISABLE_THE_MUTEX=1)
+set_target_properties(without-mutex-handling PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mutex-handling)
+add_dependencies(tests-mc without-mutex-handling)
+
+ADD_TESH(mc-random-bug-replay --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/random-bug --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/random-bug random-bug-replay.tesh)
+IF(SIMGRID_HAVE_MC)
+ ADD_TESH(tesh-mc-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:none)
+ ADD_TESH(tesh-mc-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:dpor)
+ ADD_TESH(tesh-mc-without-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:none)
+ ADD_TESH(tesh-mc-without-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:dpor)
+ ADD_TESH(mc-random-bug --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/random-bug --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/random-bug random-bug.tesh)
+ENDIF()
+
+if(enable_coverage)
+ ADD_TEST(cover-mc-mutex-handling ${CMAKE_CURRENT_BINARY_DIR}/mutex-handling/mutex-handling ${CMAKE_HOME_DIRECTORY}/examples/platforms/small_platform.xml)
+endif()
+
+
+foreach(x
+ simple_barrier_ok simple_barrier_deadlock
+ simple_barrier_with_threads_ok simple_barrier_with_threads_deadlock
+
+# simple_cond_ok
+
+# simple_cond_broadcast_ok simple_cond_broadcast_deadlock
+# simple_cond_broadcast_with_semaphore_ok
+# simple_cond_broadcast_with_semaphore_deadlock1 simple_cond_broadcast_with_semaphore_deadlock2
+
+# simple_cond_deadlock
+ simple_mutex_ok simple_mutex_deadlock
+ simple_mutex_with_threads_ok simple_mutex_with_threads_deadlock
+
+ simple_semaphore_deadlock simple_semaphores_deadlock
+ simple_semaphores_ok
+ simple_semaphores_with_threads_ok simple_semaphores_with_threads_deadlock
+
+ simple_threads_ok
+
+ barber_shop_ok barber_shop_deadlock
+ philosophers_semaphores_ok philosophers_semaphores_deadlock
+ philosophers_mutex_ok philosophers_mutex_deadlock
+ producer_consumer_ok producer_consumer_deadlock
+
+ # philosophers_spurious_deadlock # infinite no-op loop
+ # producer_consumer_spurious_nok # infinite no-op loop
+ )
+
+ set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.c)
+ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh)
+
+ if("${CMAKE_SYSTEM}" MATCHES "Linux" AND ${enable_testsuite_McMini})
+ add_executable (mcmini-${x} EXCLUDE_FROM_ALL mcmini/${x}.c)
+ set_target_properties(mcmini-${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mcmini)
+ target_link_libraries(mcmini-${x} PRIVATE Threads::Threads)
+ add_dependencies(tests-mc mcmini-${x})
+
+ ADD_TESH(mc-mini-${x} --setenv libdir=${CMAKE_BINARY_DIR}/lib --setenv bindir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh)
+ endif()
+endforeach()
+
+set(teshsuite_src ${teshsuite_src} PARENT_SCOPE)
+set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/random-bug/random-bug-replay.tesh
+ ${CMAKE_CURRENT_SOURCE_DIR}/mutex-handling/without-mutex-handling.tesh PARENT_SCOPE)
