X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f365dfb058131f5436c5cd47612c9cf5ebe49993..5f5a10db6fc4552782638abb4817041223e17775:/tools/cmake/Tests.cmake?ds=sidebyside diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 7a9af11cfc..c5567a06ab 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -13,23 +13,24 @@ IF(enable_memcheck) execute_process(COMMAND ${VALGRIND_EXE} --version OUTPUT_VARIABLE "VALGRIND_VERSION") message(STATUS "Valgrind version: ${VALGRIND_VERSION}") - set(TESH_WRAPPER ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/my_valgrind.pl) - set(TESH_WRAPPER ${TESH_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\ ) + 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(TESH_WRAPPER ${TESH_WRAPPER}\ --xml=yes\ --xml-file=memcheck_test_%p.memcheck\ --child-silent-after-fork=yes\ ) + 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) + set(TESH_OPTION ${TESH_OPTION} --setenv VALGRIND_NO_TRACE_CHILDREN=--trace-children=no) -# message(STATUS "tesh wrapper: ${TESH_WRAPPER}") +# message(STATUS "tesh wrapper: ${VALGRIND_WRAPPER}") - mark_as_advanced(TESH_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(TESH_WRAPPER_UNBOXED "${TESH_WRAPPER}") -SEPARATE_ARGUMENTS(TESH_WRAPPER_UNBOXED) +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 @@ -40,11 +41,8 @@ ENDIF() MACRO(ADD_TESH NAME) SET(ARGT ${ARGV}) LIST(REMOVE_AT ARGT 0) - IF(WIN32) - STRING(REPLACE "§" "\;" ARGT "${ARGT}") - ENDIF() - if(TESH_WRAPPER) - ADD_TEST(${NAME} ${TESH_COMMAND} --wrapper "${TESH_WRAPPER}" ${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() @@ -110,38 +108,54 @@ MACRO(SET_TESH_PROPERTIES NAME FACTORIES) FOREACH(FACTORY ${FACTORIES_LIST}) set_tests_properties("${NAME}-${FACTORY}" PROPERTIES ${ARGR}) ENDFOREACH() -ENDMACRO() - -IF(enable_java) - IF(WIN32) - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/\;${CMAKE_BINARY_DIR}/teshsuite/java/\;${SIMGRID_JAR}") - STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}") - ELSE() - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/:${CMAKE_BINARY_DIR}/teshsuite/java/:${SIMGRID_JAR}") - ENDIF() -ENDIF() +ENDMACRO() # New tests should use the Catch Framework set(UNIT_TESTS src/xbt/unit-tests_main.cpp + src/kernel/resource/NetworkModelFactors_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/random_test.cpp src/xbt/xbt_str_test.cpp - src/kernel/lmm/maxmin_test.cpp) + src/xbt/utils/iter/subsets_tests.cpp + src/kernel/lmm/maxmin_test.cpp) + +set(MC_UNIT_TESTS src/mc/explo/odpor/ClockVector_test.cpp + src/mc/explo/odpor/Execution_test.cpp + src/mc/explo/odpor/WakeupTree_test.cpp + + src/mc/explo/udpor/Unfolding_test.cpp + src/mc/explo/udpor/UnfoldingEvent_test.cpp + src/mc/explo/udpor/EventSet_test.cpp + src/mc/explo/udpor/ExtensionSet_test.cpp + src/mc/explo/udpor/History_test.cpp + src/mc/explo/udpor/Configuration_test.cpp) if (SIMGRID_HAVE_MC) - set(UNIT_TESTS ${UNIT_TESTS} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp) + set(UNIT_TESTS ${UNIT_TESTS} ${MC_UNIT_TESTS}) else() - set(EXTRA_DIST ${EXTRA_DIST} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp) -endif() + set(EXTRA_DIST ${EXTRA_DIST} ${MC_UNIT_TESTS}) +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) 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) +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})