X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fccd092a0027eb1a36b3891347d3aecaa8a8410f..db1df4b379b3e088b50f6e573ba9b0887b59c96a:/tools/cmake/Tests.cmake

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 39e78d82e4..d0968fff0c 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -90,10 +90,38 @@ ADD_TEST(testall                                 ${CMAKE_BINARY_DIR}/testall)
 
 # New tests should use the Boost Unit Test Framework
 if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  add_executable       (unit_tmgr src/surf/trace_mgr_test.cpp)
-  target_link_libraries(unit_tmgr simgrid ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-  ADD_TEST(unit_tmgr ${CMAKE_BINARY_DIR}/unit_tmgr --build_info=yes)
+  add_library(boost_unit_test_framework SHARED IMPORTED)
+  set_target_properties(boost_unit_test_framework PROPERTIES IMPORTED_LOCATION ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   
+  add_executable       (unit-tmgr src/surf/trace_mgr_test.cpp)
+  target_link_libraries(unit-tmgr simgrid boost_unit_test_framework)
+  ADD_TEST(unit-tmgr ${CMAKE_BINARY_DIR}/unit-tmgr --build_info=yes)
+  set_property(
+    TARGET unit-tmgr
+    APPEND PROPERTY
+           INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
+	   )
+  if (SIMGRID_HAVE_MC)
+    # snapshot
+    add_executable       (unit-mc-snapshot src/mc/sosp/mc_snapshot_test.cpp)
+    target_link_libraries(unit-mc-snapshot simgrid boost_unit_test_framework)
+    ADD_TEST(unit-mc-snapshot ${CMAKE_BINARY_DIR}/unit-mc-snapshot --build_info=yes)
+    set_property(
+      TARGET unit-mc-snapshot
+      APPEND PROPERTY
+             INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
+	     )
+    # pagestore
+    add_executable       (unit-mc-pagestore src/mc/sosp/PageStore_test.cpp)
+    target_link_libraries(unit-mc-pagestore simgrid boost_unit_test_framework)
+    ADD_TEST(unit-mc-pagestore ${CMAKE_BINARY_DIR}/unit-mc-pagestore --build_info=yes)
+    set_property(
+      TARGET unit-mc-pagestore
+      APPEND PROPERTY
+             INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
+	     )
+  endif()
+
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       src/surf/trace_mgr_test.cpp)
 endif()
@@ -104,7 +132,7 @@ if((NOT enable_memcheck) AND (NOT enable_address_sanitizer) AND (NOT enable_unde
   set(tuto-src-path "${CMAKE_SOURCE_DIR}/doc/tuto-msg")
   set(tuto-bin-path "${CMAKE_BINARY_DIR}/doc/tuto-msg")
   set(tuto-platform-file "${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml")
-  set(tuto-make "make -C ${tuto-bin-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=\"-I${CMAKE_SOURCE_DIR}/include -I${CMAKE_BINARY_DIR}/include -L${CMAKE_BINARY_DIR}/lib\"")
+  set(tuto-make "make -C ${tuto-bin-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=\"-I${CMAKE_SOURCE_DIR}/include -I${CMAKE_BINARY_DIR}/include -L${CMAKE_BINARY_DIR}/lib -Wl,-rpath ${CMAKE_BINARY_DIR}/lib\"")
   ADD_TEST(tuto-msg-clean sh -xc "${tuto-make} clean")
   ADD_TEST(tuto-msg-0 sh -xc "${tuto-make} masterworker      && ${tuto-bin-path}/masterworker      ${tuto-platform-file} ${tuto-src-path}/deployment0.xml")
   ADD_TEST(tuto-msg-1 sh -xc "${tuto-make} masterworker-sol1 && ${tuto-bin-path}/masterworker-sol1 ${tuto-platform-file} ${tuto-src-path}/deployment1.xml")
@@ -116,7 +144,7 @@ if((NOT enable_memcheck) AND (NOT enable_address_sanitizer) AND (NOT enable_unde
   SET_TESTS_PROPERTIES(tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4 PROPERTIES FIXTURES_REQUIRED tuto-msg-clean)
 
   FOREACH(TUTOTEST tuto-msg-0 tuto-msg-1 tuto-msg-2 tuto-msg-3 tuto-msg-4)
-  SET_TESTS_PROPERTIES(${TUTOTEST} 
+  SET_TESTS_PROPERTIES(${TUTOTEST}
                        PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
   ENDFOREACH()
 endif()