-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_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(enable_memcheck_xml)
SET(TESH_WRAPPER ${TESH_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: ${TESH_WRAPPER}")
message(STATUS "Error: Command valgrind not found --> enable_memcheck autoset to false.")
endif()
ENDIF()
+SET(TESH_WRAPPER_UNBOXED "${TESH_WRAPPER}")
+SEPARATE_ARGUMENTS(TESH_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
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)
SET(ARGR ${ARGV})
LIST(REMOVE_AT ARGR 0) # remove name
FOREACH(I ${FACTORIES}) # remove all factories
LIST(REMOVE_AT ARGR 0)
ENDFOREACH()
- FOREACH(FACTORY ${FACTORIES})
- 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()
+ SETUP_FACTORIES_LIST(${FACTORIES})
+ FOREACH(FACTORY ${FACTORIES_LIST})
+ ADD_TESH("${NAME}-${FACTORY}" "--cfg" "contexts/factory:${FACTORY}" ${ARGR})
ENDFOREACH()
ENDMACRO()
FOREACH(I ${FACTORIES}) # remove all factories
LIST(REMOVE_AT ARGR 0)
ENDFOREACH()
- FOREACH(FACTORY ${FACTORIES})
- 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))
- set_tests_properties("${NAME}-${FACTORY}" PROPERTIES ${ARGR})
- endif()
+ SETUP_FACTORIES_LIST(${FACTORIES})
+ FOREACH(FACTORY ${FACTORIES_LIST})
+ set_tests_properties("${NAME}-${FACTORY}" PROPERTIES ${ARGR})
ENDFOREACH()
ENDMACRO()
# New tests should use the Catch Framework
set(UNIT_TESTS src/xbt/unit-tests_main.cpp
- src/kernel/resource/profile/trace_mgr_test.cpp
+ src/kernel/resource/NetworkModelIntf_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/surf/SplitDuplexLinkImpl_test.cpp
src/xbt/config_test.cpp
src/xbt/dict_test.cpp
src/xbt/dynar_test.cpp
- src/xbt/xbt_str_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/mc_snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+ 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/mc_snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+ set(EXTRA_DIST ${EXTRA_DIST} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
endif()
-add_executable (unit-tests ${UNIT_TESTS})
+add_executable (unit-tests EXCLUDE_FROM_ALL ${UNIT_TESTS})
+add_dependencies (tests unit-tests)
target_link_libraries(unit-tests simgrid)
ADD_TEST(unit-tests ${CMAKE_BINARY_DIR}/unit-tests)
set_property(TARGET unit-tests APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
-add_dependencies(tests unit-tests)
set(EXTRA_DIST ${EXTRA_DIST} ${UNIT_TESTS})
unset(UNIT_TESTS)
