MBI: use file globbing to make sure that we don't forget any generator

[simgrid.git] / teshsuite / smpi / MBI / CMakeLists.txt

diff --git a/teshsuite/smpi/MBI/CMakeLists.txt b/teshsuite/smpi/MBI/CMakeLists.txt
index dbd755821e65046d4e5587eab00141847c35b9f3..7a0b334b6a47d90073f6448324ebb21a72343ca3 100644 (file)
--- a/teshsuite/smpi/MBI/CMakeLists.txt
+++ b/teshsuite/smpi/MBI/CMakeLists.txt
@@ -5,37 +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
-    InputHazardGenerator.py
-    MissingWaitandStartGenerator.py
-    P2PArgGenerator.py
-    P2PBufferingGenerator.py
-    P2PComGenerator.py
-    P2PInvalidComGenerator.py
-    P2PLocalConcurrencyGenerator.py
-    P2PMatchingANYSRCGenerator.py
-    P2PMatchingGenerator.py
-    P2PMessageRaceGenerator.py
-    P2PMessageRaceTagsGenerator.py
-    P2PProbeGenerator.py
-    ResleakGenerator.py
-    RMAArgGenerator.py
-    RMAInvalidArgGenerator.py
-    RMALocalLocalConcurrencyGenerator.py
-    RMAP2PGlobalConcurrencyGenerator.py
-    RMAP2PLocalConcurrencyGenerator.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.")
@@ -48,9 +17,10 @@ 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}
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} ${script}
                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/MBI/tmp
                     RESULT_VARIABLE status)
     if (NOT status EQUAL 0)
@@ -65,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})
@@ -111,10 +82,30 @@ if (enable_smpi_MBI_testsuite)
           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_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 )