Add more tests from McMini

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

diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt
index dd51f9a..67fe6ab 100644 (file)
--- a/teshsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/CMakeLists.txt
@@ -56,11 +56,11 @@ endif()
 
 if("${CMAKE_SYSTEM}" MATCHES "Linux")
   foreach(x  
-#             barber_shop_deadlock producer_consumer_deadlock
+#              
 #             simple_cond_broadcast_deadlock  simple_semaphore_deadlock  simple_barrier_deadlock  simple_cond_deadlock
 #                   simple_semaphores_deadlock
-#                   philosophers_mutex_deadlock
-#                   philosophers_semaphores_deadlock
+#                   
+#                   
 #                   philosophers_spurious_deadlock
 #                   simple_barrier_with_threads_deadlock
 #                   simple_semaphores_with_threads_deadlock
@@ -68,9 +68,16 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux")
 #                   simple_mutex_deadlock
 #                   simple_mutex_with_threads_deadlock
             
-             barber_shop_ok
-#             philosophers_mutex_ok philosophers_semaphores_ok 
-#             producer_consumer_ok producer_consumer_spurious_nok
+             barber_shop_ok             barber_shop_deadlock
+             philosophers_semaphores_ok philosophers_semaphores_deadlock
+             philosophers_mutex_ok      philosophers_mutex_deadlock
+             producer_consumer_ok       producer_consumer_deadlock    
+             
+             
+             # 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
@@ -84,10 +91,10 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux")
     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(mc-mini-${x} PUBLIC "-Wl,-znorelro -Wl,-znoseparate-code") # TODO: convert to target_link_option once CMAKE_VERSION is >3.13
+      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_FACTORIES(mc-mini-${x} "^thread" --setenv libdir=${CMAKE_BINARY_DIR}/lib --setenv bindir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh)
+    ADD_TESH(mc-mini-${x} --setenv libdir=${CMAKE_BINARY_DIR}/lib --setenv bindir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh)
   endforeach()      
 endif()