Implement pthread_barrier calls in sthread, and test them in McMini

[simgrid.git] / teshsuite / mc / CMakeLists.txt

diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt
index 0169a17..41cad5e 100644 (file)
--- a/teshsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/CMakeLists.txt
@@ -1,10 +1,5 @@
-if (NOT SIMGRID_HAVE_STATEFUL_MC)
-  set(dwarf_disable 1)
-  set(dwarf-expression_disable 1)
-endif()
-
 
-foreach(x dwarf dwarf-expression random-bug mutex-handling)
+foreach(x random-bug mutex-handling)
 
   if(NOT DEFINED ${x}_sources)
     set(${x}_sources ${x}/${x}.cpp)
@@ -44,10 +39,6 @@ IF(SIMGRID_HAVE_MC)
   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(SIMGRID_HAVE_STATEFUL_MC)
-  ADD_TESH(tesh-mc-dwarf                       --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf            --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf dwarf.tesh)
-  ADD_TESH(tesh-mc-dwarf-expression            --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf-expression --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf-expression dwarf-expression.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)
@@ -56,16 +47,16 @@ endif()
 
 foreach(x
 #              
-#             simple_cond_broadcast_deadlock  simple_semaphore_deadlock  simple_barrier_deadlock  simple_cond_deadlock
-#                   simple_semaphores_deadlock
-#                   
+#             simple_cond_broadcast_deadlock   simple_barrier_deadlock  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
 #                   
 #                   philosophers_spurious_deadlock
-#                   simple_barrier_with_threads_deadlock
-#                   simple_semaphores_with_threads_deadlock
 #                   simple_cond_broadcast_with_semaphore_deadlock1  simple_cond_broadcast_with_semaphore_deadlock2
-#                   simple_mutex_deadlock
-#                   simple_mutex_with_threads_deadlock
             
              barber_shop_ok             barber_shop_deadlock
              philosophers_semaphores_ok philosophers_semaphores_deadlock
@@ -75,11 +66,11 @@ foreach(x
              
              # producer_consumer_spurious_nok # infinite no-op loop
              
-#               
-#              
-#             simple_barrier_ok simple_barrier_with_threads_ok simple_cond_broadcast_ok
-#             simple_cond_broadcast_with_semaphore_ok simple_cond_ok simple_mutex_ok
-#             simple_mutex_with_threads_ok simple_semaphores_ok simple_semaphores_with_threads_ok simple_threads_ok
+             simple_barrier_ok              simple_barrier_deadlock
+             simple_barrier_with_threads_ok simple_barrier_with_threads_deadlock
+#              simple_cond_broadcast_ok
+#             simple_cond_broadcast_with_semaphore_ok simple_cond_ok 
+#               simple_threads_ok
              )
 
   set(teshsuite_src  ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.c)
@@ -90,9 +81,6 @@ foreach(x
     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})
-    if(SIMGRID_HAVE_STATEFUL_MC) # Only needed to introspect the binary
-      target_link_libraries(mcmini-${x} PUBLIC "-Wl,-znorelro -Wl,-znoseparate-code") # TODO: convert to target_link_option once CMAKE_VERSION is >3.13
-    endif()  
 
     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()