X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6a2ada11480242c200660a273f4174151d0bf09..288609da2372bbddd029141b616af67e6160e714:/tools/cmake/Tests.cmake

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index ce7d830116..6023103a61 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}")
 
@@ -129,18 +130,29 @@ set(UNIT_TESTS  src/xbt/unit-tests_main.cpp
                 src/xbt/utils/iter/subsets_tests.cpp
                 src/kernel/lmm/maxmin_test.cpp)
 
-set(MC_UNIT_TESTS src/mc/sosp/Snapshot_test.cpp 
-                  src/mc/sosp/PageStore_test.cpp
-                  src/mc/explo/udpor/EventSet_test.cpp
-                  src/mc/explo/udpor/Unfolding_test.cpp
-                  src/mc/explo/udpor/UnfoldingEvent_test.cpp
-                  src/mc/explo/udpor/History_test.cpp
-                  src/mc/explo/udpor/Configuration_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)
+
+set(STATEFUL_MC_UNIT_TESTS src/mc/sosp/Snapshot_test.cpp
+                           src/mc/sosp/PageStore_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} ${MC_UNIT_TESTS})
 else()
   set(EXTRA_DIST ${EXTRA_DIST} ${MC_UNIT_TESTS})
 endif()
+if (SIMGRID_HAVE_STATEFUL_MC)
+  set(UNIT_TESTS ${UNIT_TESTS} ${STATEFUL_MC_UNIT_TESTS})
+else()
+  set(EXTRA_DIST ${EXTRA_DIST} ${STATEFUL_MC_UNIT_TESTS})
+endif()
 if (SIMGRID_HAVE_EIGEN3)
   set(UNIT_TESTS ${UNIT_TESTS} src/kernel/lmm/bmf_test.cpp)
 else()