Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
MBI: use file globbing to make sure that we don't forget any generator
[simgrid.git] / teshsuite / smpi / MBI / CMakeLists.txt
index f9b5d78..7a0b334 100644 (file)
@@ -5,32 +5,6 @@
 # Only the python scripts are embeeded in the archive, and the C test files are generated at config time using these scripts.
 # These python scripts are copied over from the MBI repository with as little changes as possible.
 
-set(generator_scripts 
-    CollArgGenerator.py
-    CollComGenerator.py
-    CollLocalConcurrencyGenerator.py
-    CollMatchingGenerator.py
-    CollP2PMatchingGenerator.py
-    CollP2PMessageRaceGenerator.py
-    CollTopoGenerator.py
-    MissingWaitandStartGenerator.py
-    P2PArgGenerator.py
-    P2PComGenerator.py
-    P2PInvalidComGenerator.py
-    P2PLocalConcurrencyGenerator.py
-    P2PMatchingANYSRCGenerator.py
-    P2PMatchingGenerator.py
-    P2PProbeGenerator.py
-    ResleakGenerator.py
-    RMAArgGenerator.py
-    RMAInvalidArgGenerator.py
-    RMALocalLocalConcurrencyGenerator.py
-    RMAP2PGlobalConcurrencyGenerator.py
-    RMARemoteLocalConcurrencyGenerator.py
-    RMARemoteRemoteConcurrencyGenerator.py
-    RMAReqLifecycleGenerator.py
-    RMAWinBufferGenerator.py)
-
 if (enable_smpi_MBI_testsuite)
   if (NOT enable_smpi)
     message(FATAL_ERROR "MBI test suite cannot be enabled without SMPI. Please change either setting.")
@@ -43,10 +17,15 @@ if (enable_smpi_MBI_testsuite)
   file(REMOVE_RECURSE  ${CMAKE_BINARY_DIR}/MBI/tmp)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/MBI/tmp)
   file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/generator_utils.py DESTINATION ${CMAKE_BINARY_DIR}/MBI/tmp)
+  file(GLOB generator_scripts *Generator.py)
   foreach (script ${generator_scripts})
     message(STATUS "  $ ${CMAKE_CURRENT_SOURCE_DIR}/${script}")
-    execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${script}
-                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/MBI/tmp)
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} ${script}
+                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/MBI/tmp
+                    RESULT_VARIABLE status)
+    if (NOT status EQUAL 0)
+      message(FATAL_ERROR "Command failed with status: ${status}")
+    endif()
   endforeach()
 
   set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
@@ -56,6 +35,7 @@ if (enable_smpi_MBI_testsuite)
   # Connect the MBI tests to the other tests
   add_custom_target(tests-mbi COMMENT "Recompiling the MBI tests and tools.")
   add_dependencies(tests tests-mbi)
+  add_dependencies(tests-mbi simgrid-mc smpimain)
 
   file(GLOB cfiles RELATIVE ${CMAKE_BINARY_DIR}/MBI/tmp ${CMAKE_BINARY_DIR}/MBI/tmp/*.c )
   foreach(cfile ${cfiles})
@@ -70,7 +50,7 @@ if (enable_smpi_MBI_testsuite)
     # Generate an executable for each of them
     add_executable(mbi_${basefile} EXCLUDE_FROM_ALL ${CMAKE_BINARY_DIR}/MBI/${cfile})
     target_link_libraries(mbi_${basefile} simgrid)
-    target_compile_options(mbi_${basefile} PRIVATE "-Wno-error")
+    target_compile_options(mbi_${basefile} PRIVATE "-Wno-unused-variable")
     set_target_properties(mbi_${basefile} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/MBI)
     add_dependencies(tests-mbi mbi_${basefile})
 
@@ -90,22 +70,42 @@ if (enable_smpi_MBI_testsuite)
 
   # The following tests are known to fail because simgrid does not intercept local modifications yet
   # An idea could be to use ASan on the verified application, along with https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning
-  # But currently, ASan is not usable at all, since the Checker dislikes this trick when it tries to read the memory of the app. 
+  # But currently, ASan is not usable at all, since the Checker dislikes this trick when it tries to read the memory of the app.
   # We should change the checker to not read the app when verifying safty properties
-  foreach(localmodif 
+  foreach(localmodif
           LocalConcurrency_Iallgather_nok      LocalConcurrency_Iallgatherv_nok     LocalConcurrency_Iallreduce_nok      LocalConcurrency_Ialltoall_nok
           LocalConcurrency_Ialltoallv_nok      LocalConcurrency_Ibcast_nok          LocalConcurrency_Iexscan_nok         LocalConcurrency_Igather_nok
           LocalConcurrency_Irecv_Isend_nok     LocalConcurrency_Irecv_Send_init_nok LocalConcurrency_Irecv_Send_nok      LocalConcurrency_Ireduce_nok
           LocalConcurrency_Iscan_nok           LocalConcurrency_Iscatter_nok        LocalConcurrency_Recv_Isend_nok      LocalConcurrency_Recv_Send_init_nok
           LocalConcurrency_Recv_init_Isend_nok LocalConcurrency_Recv_init_Send_nok  LocalConcurrency_Recv_init_Send_init_nok
 
-          GlobalConcurrency_Get_Isend_Irecv_nok GlobalConcurrency_Get_Isend_Recv_nok GlobalConcurrency_Get_Send_Irecv_nok GlobalConcurrency_Get_Send_Recv_nok 
-          GlobalConcurrency_Put_Isend_Irecv_nok GlobalConcurrency_Put_Isend_Recv_nok GlobalConcurrency_Put_Send_Irecv_nok GlobalConcurrency_Put_Send_Recv_nok 
-
-          GlobalConcurrency_rl_Win_fence_Get_rload_nok     GlobalConcurrency_rl_Win_fence_Get_rstore_nok 
-          GlobalConcurrency_rl_Win_fence_Put_rload_nok     GlobalConcurrency_rl_Win_fence_Put_rstore_nok
-          GlobalConcurrency_rl_Win_lock_all_Get_rload_nok  GlobalConcurrency_rl_Win_lock_all_Get_rstore_nok
-          GlobalConcurrency_rl_Win_lock_all_Put_rload_nok  GlobalConcurrency_rl_Win_lock_all_Put_rstore_nok
+          GlobalConcurrency_Get_Isend_Irecv_nok GlobalConcurrency_Get_Isend_Recv_nok GlobalConcurrency_Get_Send_Irecv_nok GlobalConcurrency_Get_Send_Recv_nok
+          GlobalConcurrency_Put_Isend_Irecv_nok GlobalConcurrency_Put_Isend_Recv_nok GlobalConcurrency_Put_Send_Irecv_nok GlobalConcurrency_Put_Send_Recv_nok
+
+          GlobalConcurrency_rl_Win_fence_Get_rstore_nok   GlobalConcurrency_rl_Win_lock_all_Get_rstore_nok
+         GlobalConcurrency_rl_Win_fence_Put_rstore_nok   GlobalConcurrency_rl_Win_lock_all_Put_rstore_nok
+
+          GlobalConcurrency_rl_Win_fence_Get_Get_nok
+         GlobalConcurrency_rl_Win_fence_Put_Get_nok
+         GlobalConcurrency_rl_Win_fence_Put_Put_nok
+         GlobalConcurrency_rl_Win_fence_Put_rload_nok
+
+          GlobalConcurrency_rl_Win_lock_Get_Get_nok
+         GlobalConcurrency_rl_Win_lock_Get_rstore_nok
+         GlobalConcurrency_rl_Win_lock_Put_Get_nok
+         GlobalConcurrency_rl_Win_lock_Put_Put_nok
+         GlobalConcurrency_rl_Win_lock_Put_rload_nok
+         GlobalConcurrency_rl_Win_lock_Put_rstore_nok
+         GlobalConcurrency_rl_Win_lock_all_Get_Get_nok
+         GlobalConcurrency_rl_Win_lock_all_Put_Get_nok
+         GlobalConcurrency_rl_Win_lock_all_Put_Put_nok
+         GlobalConcurrency_rl_Win_lock_all_Put_rload_nok
+         GlobalConcurrency_rr_Win_fence_Get_Put_nok
+         GlobalConcurrency_rr_Win_fence_Put_Put_nok
+         GlobalConcurrency_rr_Win_lock_Get_Put_nok
+         GlobalConcurrency_rr_Win_lock_Put_Put_nok
+         GlobalConcurrency_rr_Win_lock_all_Get_Put_nok
+         GlobalConcurrency_rr_Win_lock_all_Put_Put_nok
        )
     set_tests_properties(mbi-${localmodif} PROPERTIES WILL_FAIL true)
   endforeach(localmodif )