-set(sources "")
-FOREACH(s ${umpire_src})
- set(sources ${sources} ${CMAKE_CURRENT_SOURCE_DIR}/${s})
-ENDFOREACH()
-
-set(umpire_tesh "")
-foreach(tesh
- any_src-can-deadlock10
- any_src-can-deadlock4
- any_src-can-deadlock5
- any_src-can-deadlock6
- any_src-waitall-deadlock2
- any_src-waitall-deadlock3
- any_src-waitany-deadlock2
- any_src-waitany-deadlock
- any_src-wait-deadlock
- basic-deadlock-comm_create
- basic-deadlock-comm_dup
- basic-deadlock-comm_split
- basic-deadlock
- bcast-deadlock
- collective-misorder-allreduce
- collective-misorder
- complex-deadlock
- deadlock-config
- finalize-deadlock
- irecv-deadlock
- no-error2
- no-error3-any_src
- no-error3
- no-error
- )
- set(umpire_tesh ${umpire_tesh} teshsuite/smpi/isp/umpire/${tesh}.tesh)
-ENDFOREACH()
-
-set(examples_src ${examples_src} ${sources} PARENT_SCOPE)
-set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/README PARENT_SCOPE)
-set(EXTRA_DIST ${EXTRA_DIST} ${CMAKE_CURRENT_SOURCE_DIR}/no-error-wait2.c PARENT_SCOPE)
-set(tesh_files ${tesh_files} ${umpire_tesh} PARENT_SCOPE)
-
-if(enable_smpi AND enable_smpi_ISP_testsuite)
- if(WIN32)
- set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
- else()
- set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
- set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
- endif()
-
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
- include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
-
- FOREACH (s ${umpire_src})
- STRING(REGEX REPLACE "\\.c$" "" exe ${s})
- add_executable(${exe} ${s})
- target_link_libraries(${exe} simgrid)
- set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS "-Wno-error")
- ENDFOREACH(s)
+# Add these files to the archive
+#################
+
+set(sources "${CMAKE_CURRENT_SOURCE_DIR}/README")
+foreach(file ${umpire_src_other})
+ set(sources ${sources} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+endforeach()
+
+foreach(file
+ ${umpire_tests_passing} ${umpire_tests_passing_broken}
+ ${umpire_tests_deadlock} ${umpire_tests_deadlock_broken} ${umpire_tests_missed_deadlock}
+ ${umpire_tests_problematic}
+ ${umpire_tests_ignored} )
+ set(sources ${sources} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c)
+endforeach()
+set(txt_files ${txt_files} ${sources} PARENT_SCOPE)
+
+# Build the tests
+#################
+
+if(enable_smpi AND enable_model-checking AND enable_smpi_ISP_testsuite)
+ set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
+ set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
+
+ include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
+
+ foreach (test ${umpire_tests_passing} ${umpire_tests_deadlock} ${umpire_tests_problematic} )
+ add_executable(${test} EXCLUDE_FROM_ALL ${test}.c)
+ add_dependencies(tests ${test})
+ target_link_libraries(${test} simgrid)
+ set_source_files_properties(${test}.c PROPERTIES COMPILE_FLAGS "-Dlint -Wno-error -Wno-return-type")
+ set(umpire_tesh ${umpire_tesh} ${test})
+ set(files_to_clean ${files_to_clean} ${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh)
+ endforeach(test)
+
+ # TODO, what should we do about ${umpire_tests_missed_deadlock}?
+
+ foreach (test ${umpire_tests_passing})
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! timeout 30")
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! output display" APPEND)
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "\$ \${bindir:=.}/../../../../smpi_script/bin/smpirun -wrapper \"\${bindir:=.}/../../../../bin/simgrid-mc\" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=smpi/host-speed:1e9 --cfg=smpi/coll-selector:ompi \${bindir:=.}/${test} --log=smpi_coll.thresh:error" APPEND)
+ endforeach()
+
+ foreach (test ${umpire_tests_deadlock} ${umpire_tests_problematic} )
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! timeout 30" )
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! expect return 3" APPEND)
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! output display" APPEND)
+ write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "\$ \${bindir:=.}/../../../../smpi_script/bin/smpirun -wrapper \"\${bindir:=.}/../../../../bin/simgrid-mc\" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=smpi/buffering:zero --cfg=smpi/coll-selector:ompi \${bindir:=.}/${test} --log=smpi_coll.thresh:error" APPEND)
+ endforeach()
+endif()
+
+# Erase all tesh files on cleanup: they are generated anyway
+set_directory_properties ( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${files_to_clean}" )
+
+if(enable_smpi AND enable_model-checking AND enable_smpi_ISP_testsuite)
+ foreach (tesh ${umpire_tesh})
+ ADD_TESH(mc-umpire-${tesh}
+ --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR}
+ --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}
+ --cd ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/${tesh}.tesh)
+ endforeach()