-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)
-SET(TESH_COMMAND ${PERL_EXECUTABLE} ${CMAKE_BINARY_DIR}/bin/tesh)
-IF(CMAKE_HOST_WIN32)
- SET(TESH_OPTION ${TESH_OPTION} --timeout 50)
-ENDIF()
+SET(TESH_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib")
+if(NOT $ENV{LD_LIBRARY_PATH} STREQUAL "")
+ SET(TESH_LIBRARY_PATH "${TESH_LIBRARY_PATH}:$ENV{LD_LIBRARY_PATH}")
+endif()
IF(enable_memcheck)
INCLUDE(FindValgrind)
+
+ if (NOT VALGRIND_EXE MATCHES "NOTFOUND")
+ execute_process(COMMAND ${VALGRIND_EXE} --version OUTPUT_VARIABLE "VALGRIND_VERSION")
+ message(STATUS "Valgrind version: ${VALGRIND_VERSION}")
+
+ set(VALGRIND_WRAPPER ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/my_valgrind.pl)
+ set(VALGRIND_WRAPPER ${VALGRIND_WRAPPER}\ --trace-children=yes\ --trace-children-skip=/usr/bin/*,/bin/*\ --leak-check=full\ --show-reachable=yes\ --track-origins=no\ --read-var-info=no\ --num-callers=20\ --suppressions=${CMAKE_HOME_DIRECTORY}/tools/simgrid.supp\ )
+ if(enable_memcheck_xml)
+ SET(VALGRIND_WRAPPER ${VALGRIND_WRAPPER}\ --xml=yes\ --xml-file=memcheck_test_%p.memcheck\ --child-silent-after-fork=yes\ )
+ endif()
+ set(TESH_OPTION ${TESH_OPTION} --setenv VALGRIND_NO_LEAK_CHECK=--leak-check=no\ --show-leak-kinds=none)
+
+# message(STATUS "tesh wrapper: ${VALGRIND_WRAPPER}")
+
+ mark_as_advanced(VALGRIND_WRAPPER)
+ else()
+ set(enable_memcheck false)
+ message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
+ endif()
ENDIF()
+SET(VALGRIND_WRAPPER_UNBOXED "${VALGRIND_WRAPPER}")
+SEPARATE_ARGUMENTS(VALGRIND_WRAPPER_UNBOXED)
#some tests may take forever on non futexes systems, using busy_wait with n cores < n workers
# default to posix for these tests if futexes are not supported
IF(WIN32)
STRING(REPLACE "§" "\;" ARGT "${ARGT}")
ENDIF()
- ADD_TEST(${NAME} ${TESH_COMMAND} ${TESH_OPTION} ${ARGT})
+ if(VALGRIND_WRAPPER)
+ ADD_TEST(${NAME} ${TESH_COMMAND} --wrapper "${VALGRIND_WRAPPER}" ${TESH_OPTION} ${ARGT})
+ else()
+ ADD_TEST(${NAME} ${TESH_COMMAND} ${TESH_OPTION} ${ARGT})
+ endif()
+ENDMACRO()
+
+# Build a list variable named FACTORIES_LIST with the given arguments, but:
+# - replace wildcard "*" with all known factories
+# - if the list begins with "^", take the complement
+# - finally remove unsupported factories
+#
+# Used by ADD_TESH_FACTORIES, and SET_TESH_PROPERTIES
+MACRO(SETUP_FACTORIES_LIST)
+ set(ALL_KNOWN_FACTORIES "thread;boost;raw;ucontext")
+
+ if("${ARGV}" STREQUAL "*") # take all known factories
+ SET(FACTORIES_LIST ${ALL_KNOWN_FACTORIES})
+ elseif("${ARGV}" MATCHES "^\\^") # exclude given factories
+ SET(FACTORIES_LIST ${ALL_KNOWN_FACTORIES})
+ STRING(SUBSTRING "${ARGV}" 1 -1 EXCLUDED)
+ LIST(REMOVE_ITEM FACTORIES_LIST ${EXCLUDED})
+ else() # take given factories
+ SET(FACTORIES_LIST "${ARGV}")
+ endif()
+
+ # Exclude unsupported factories. Threads are always available, thanks to C++11 threads.
+ if(NOT HAVE_BOOST_CONTEXTS)
+ LIST(REMOVE_ITEM FACTORIES_LIST "boost")
+ endif()
+ if(NOT HAVE_RAW_CONTEXTS)
+ LIST(REMOVE_ITEM FACTORIES_LIST "raw")
+ endif()
+ if(NOT HAVE_UCONTEXT_CONTEXTS)
+ LIST(REMOVE_ITEM FACTORIES_LIST "ucontext")
+ endif()
+
+ # Check that there is no unknown factory
+ FOREACH(FACTORY ${FACTORIES_LIST})
+ if(NOT FACTORY IN_LIST ALL_KNOWN_FACTORIES)
+ message(FATAL_ERROR "Unknown factory: ${FACTORY}")
+ endif()
+ ENDFOREACH()
ENDMACRO()
MACRO(ADD_TESH_FACTORIES NAME FACTORIES)
FOREACH(I ${FACTORIES}) # remove all factories
LIST(REMOVE_AT ARGR 0)
ENDFOREACH()
- FOREACH(FACTORY ${FACTORIES})
- if ((${FACTORY} STREQUAL "thread" AND HAVE_THREAD_CONTEXTS) OR
- (${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()
+ SETUP_FACTORIES_LIST(${FACTORIES})
+ FOREACH(FACTORY ${FACTORIES_LIST})
+ ADD_TESH("${NAME}-${FACTORY}" "--cfg" "contexts/factory:${FACTORY}" ${ARGR})
ENDFOREACH()
ENDMACRO()
-#IF(NOT enable_memcheck)
- ### GENERIC ###
- ### MC ###
- IF(HAVE_MC)
- ADD_TESH_FACTORIES(mc-bugged1 "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
- ADD_TESH_FACTORIES(mc-bugged2 "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
- IF(HAVE_UCONTEXT_CONTEXTS AND PROCESSOR_x86_64) # liveness model-checking works only on 64bits (for now ...)
- ADD_TESH(mc-bugged1-liveness-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness.tesh)
- ADD_TESH(mc-bugged1-liveness-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_sparse.tesh)
- ADD_TESH(mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_visited.tesh)
- ADD_TESH(mc-bugged1-liveness-visited-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_visited_sparse.tesh)
- if(HAVE_C_STACK_CLEANER)
- # This test checks if the stack cleaner is making a difference:
- add_test(mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/bugged1_liveness_stack_cleaner ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/ ${CMAKE_BINARY_DIR}/examples/msg/mc/)
- endif()
- ENDIF()
- ENDIF()
-
- ### SMPI ###
- IF(enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN AND HAVE_THREAD_CONTEXTS)
- ADD_TEST(test-smpi-mpich3-thread-f77 ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/f77/ ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests ${TESH_OPTION} -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/ -tests=testlist -execarg=--cfg=contexts/stack_size:8000 -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
- SET_TESTS_PROPERTIES(test-smpi-mpich3-thread-f77 PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
- ADD_TEST(test-smpi-mpich3-thread-f90 ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/f90/ ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests ${TESH_OPTION} -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/ -tests=testlist -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
- SET_TESTS_PROPERTIES(test-smpi-mpich3-thread-f90 PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
- ENDIF()
+MACRO(SET_TESH_PROPERTIES NAME FACTORIES)
+ SET(ARGR ${ARGV})
+ LIST(REMOVE_AT ARGR 0) # remove name
+ FOREACH(I ${FACTORIES}) # remove all factories
+ LIST(REMOVE_AT ARGR 0)
+ ENDFOREACH()
+ SETUP_FACTORIES_LIST(${FACTORIES})
+ FOREACH(FACTORY ${FACTORIES_LIST})
+ set_tests_properties("${NAME}-${FACTORY}" PROPERTIES ${ARGR})
+ ENDFOREACH()
+ENDMACRO()
- ## BINDINGS ##
- ### LUA ###
- IF(HAVE_LUA)
- # Tests testing simulation from C but using lua for platform files. Executed like this
- # ~$ ./masterslave platform.lua deploy.lua
- ADD_TESH(lua-platform-masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/lua --cd ${CMAKE_BINARY_DIR}/examples/lua ${CMAKE_HOME_DIRECTORY}/teshsuite/lua/lua_platforms.tesh)
- SET_TESTS_PROPERTIES(lua-platform-masterslave PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+IF(enable_java)
+ IF(WIN32)
+ SET(TESH_CLASSPATH_SEPARATOR "§")
+ ELSE()
+ SET(TESH_CLASSPATH_SEPARATOR ":")
ENDIF()
+ SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/${TESH_CLASSPATH_SEPARATOR}${CMAKE_BINARY_DIR}/teshsuite/java/${TESH_CLASSPATH_SEPARATOR}${SIMGRID_JAR}")
+ENDIF()
- ### JAVA ###
- IF(enable_java)
- IF(WIN32)
- SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/\;${CMAKE_BINARY_DIR}/teshsuite/java/\;${SIMGRID_JAR}")
- STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}")
- ELSE()
- SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${CMAKE_BINARY_DIR}/teshsuite/java/:${SIMGRID_JAR}")
- ENDIF()
- ENDIF()
-#ENDIF()
+# New tests should use the Catch Framework
+set(UNIT_TESTS src/xbt/unit-tests_main.cpp
+ src/kernel/resource/NetworkModelIntf_test.cpp
+ src/kernel/resource/SplitDuplexLinkImpl_test.cpp
+ src/kernel/resource/profile/Profile_test.cpp
+ src/kernel/routing/DijkstraZone_test.cpp
+ src/kernel/routing/DragonflyZone_test.cpp
+ src/kernel/routing/FatTreeZone_test.cpp
+ src/kernel/routing/FloydZone_test.cpp
+ src/kernel/routing/FullZone_test.cpp
+ src/kernel/routing/StarZone_test.cpp
+ src/kernel/routing/TorusZone_test.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)
+ set(UNIT_TESTS ${UNIT_TESTS} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+else()
+ set(EXTRA_DIST ${EXTRA_DIST} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+endif()
+if (SIMGRID_HAVE_EIGEN3)
+ set(UNIT_TESTS ${UNIT_TESTS} src/kernel/lmm/bmf_test.cpp)
+else()
+ set(EXTRA_DIST ${EXTRA_DIST} src/kernel/lmm/bmf_test.cpp)
+endif()
+set(EXTRA_DIST ${EXTRA_DIST} src/kernel/routing/NetZone_test.hpp)
- ## OTHER ##
-ADD_TEST(testall ${CMAKE_BINARY_DIR}/testall)
+add_executable (unit-tests EXCLUDE_FROM_ALL ${UNIT_TESTS})
+add_dependencies (tests unit-tests)
+target_link_libraries(unit-tests simgrid)
+ADD_TEST(unit-tests ${VALGRIND_WRAPPER_UNBOXED} ${CMAKE_BINARY_DIR}/unit-tests)
+set_property(TARGET unit-tests APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
+set(EXTRA_DIST ${EXTRA_DIST} ${UNIT_TESTS})
+unset(UNIT_TESTS)