X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ac44d0117144a8f461c97dd2be47c88780860c9..39e98567c557d81dd5011b8e2ae883d4674b0c9d:/tools/cmake/Tests.cmake

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index e9a56d426c..c5567a06ab 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -19,6 +19,7 @@ IF(enable_memcheck)
       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: ${VALGRIND_WRAPPER}")
 
@@ -40,9 +41,6 @@ ENDIF()
 MACRO(ADD_TESH NAME)
   SET(ARGT ${ARGV})
   LIST(REMOVE_AT ARGT 0)
-  IF(WIN32)
-    STRING(REPLACE "§" "\;" ARGT "${ARGT}")
-  ENDIF()
   if(VALGRIND_WRAPPER)
     ADD_TEST(${NAME} ${TESH_COMMAND} --wrapper "${VALGRIND_WRAPPER}" ${TESH_OPTION} ${ARGT})
   else()
@@ -112,18 +110,9 @@ MACRO(SET_TESH_PROPERTIES NAME FACTORIES)
   ENDFOREACH()
 ENDMACRO()
 
-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()
-
 # 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/NetworkModelFactors_test.cpp
                 src/kernel/resource/SplitDuplexLinkImpl_test.cpp
                 src/kernel/resource/profile/Profile_test.cpp
                 src/kernel/routing/DijkstraZone_test.cpp
@@ -138,11 +127,23 @@ set(UNIT_TESTS  src/xbt/unit-tests_main.cpp
                 src/xbt/dynar_test.cpp
                 src/xbt/random_test.cpp
                 src/xbt/xbt_str_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)
+  set(EXTRA_DIST ${EXTRA_DIST} ${MC_UNIT_TESTS})
 endif()
 if (SIMGRID_HAVE_EIGEN3)
   set(UNIT_TESTS ${UNIT_TESTS} src/kernel/lmm/bmf_test.cpp)
@@ -154,7 +155,7 @@ 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})