X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a95f36c429931dffc77527c07637d74af84af94..77c0face3a66d71cb73f4c5444d0c45bf3bb6aa1:/tools/cmake/Tests.cmake?ds=sidebyside diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index e40775287e..3dd87936a7 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -1,11 +1,3 @@ -IF(enable_smpi AND NOT WIN32) - execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc) - execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicxx) - execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff) - execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif90) - execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun) -ENDIF() - SET(TESH_OPTION "--ignore-jenkins") SET(TESH_COMMAND "${PYTHON_EXECUTABLE}" ${CMAKE_BINARY_DIR}/bin/tesh) @@ -65,12 +57,18 @@ MACRO(ADD_TESH_FACTORIES NAME FACTORIES) LIST(REMOVE_AT ARGR 0) ENDFOREACH() FOREACH(FACTORY ${FACTORIES}) - if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads + if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads (${FACTORY} STREQUAL "boost" AND HAVE_BOOST_CONTEXTS) OR (${FACTORY} STREQUAL "raw" AND HAVE_RAW_CONTEXTS) OR (${FACTORY} STREQUAL "ucontext" AND HAVE_UCONTEXT_CONTEXTS)) ADD_TESH("${NAME}-${FACTORY}" "--cfg" "contexts/factory:${FACTORY}" ${ARGR}) - ENDIF() + endif() + if ((NOT ${FACTORY} STREQUAL "thread") AND + (NOT ${FACTORY} STREQUAL "boost") AND + (NOT ${FACTORY} STREQUAL "raw") AND + (NOT ${FACTORY} STREQUAL "ucontext")) + message(FATAL_ERROR "Cannot add a tesh for an unknown factory: ${FACTORY}") + endif() ENDFOREACH() ENDMACRO() @@ -81,7 +79,7 @@ MACRO(SET_TESH_PROPERTIES NAME FACTORIES) LIST(REMOVE_AT ARGR 0) ENDFOREACH() FOREACH(FACTORY ${FACTORIES}) - if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads + if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads (${FACTORY} STREQUAL "boost" AND HAVE_BOOST_CONTEXTS) OR (${FACTORY} STREQUAL "raw" AND HAVE_RAW_CONTEXTS) OR (${FACTORY} STREQUAL "ucontext" AND HAVE_UCONTEXT_CONTEXTS)) @@ -105,6 +103,7 @@ set(UNIT_TESTS src/xbt/unit-tests_main.cpp src/xbt/config_test.cpp src/xbt/dict_test.cpp src/xbt/dynar_test.cpp + src/xbt/random_test.cpp src/xbt/xbt_str_test.cpp src/kernel/lmm/maxmin_test.cpp) if (SIMGRID_HAVE_MC)