- set(EXTRA_DIST ${EXTRA_DIST} src/surf/trace_mgr_test.cpp)
-endif()
-
-# Also test the tutorial, if SIMGRID_INSTALL_PATH is defined and gcc used
-set(tuto-path "${CMAKE_SOURCE_DIR}/doc/tuto-msg")
-set(tuto-make "make -C ${tuto-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=-I${CMAKE_BINARY_DIR}/include")
-ADD_TEST(tuto-msg-0 sh -c "${tuto-make} masterworker && ${tuto-path}/masterworker ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment0.xml")
-ADD_TEST(tuto-msg-1 sh -c "${tuto-make} masterworker-sol1 && ${tuto-path}/masterworker-sol1 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment1.xml")
-ADD_TEST(tuto-msg-2 sh -c "${tuto-make} masterworker-sol2 && ${tuto-path}/masterworker-sol2 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment2.xml")
-ADD_TEST(tuto-msg-3 sh -c "${tuto-make} masterworker-sol3 && ${tuto-path}/masterworker-sol3 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment3.xml")
-ADD_TEST(tuto-msg-4 sh -c "${tuto-make} masterworker-sol4 && ${tuto-path}/masterworker-sol4 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment3.xml")
-
-FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4)
-SET_TESTS_PROPERTIES(${TUTOTEST}
- PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
-ENDFOREACH()
+ set(EXTRA_DIST ${EXTRA_DIST} src/mc/sosp/mc_snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+endif()
+
+add_executable (unit-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)