From 428d2a22ebffacc0623193ad65defde27e6e7bc6 Mon Sep 17 00:00:00 2001 From: onesphore Date: Mon, 25 Jun 2018 17:06:39 +0200 Subject: [PATCH 1/1] Changed the 2 unit tests, snapshot and PAGESTORE, into BOOST unit tests. --- src/mc/remote/RemoteClient.cpp | 3 ++- tools/cmake/Tests.cmake | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp index da2a2c338e..6f7505f475 100644 --- a/src/mc/remote/RemoteClient.cpp +++ b/src/mc/remote/RemoteClient.cpp @@ -100,7 +100,8 @@ static const std::vector filtered_libraries = { "libunwind-x86_64", "libunwind-x86", "libunwind-ptrace", - "libz"}; + "libz", + "libboost_unit_test_framework"}; static bool is_simgrid_lib(const std::string& libname) { diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 2e86d125f4..01a5e7d0fc 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -101,6 +101,7 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND) INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}" ) if (SIMGRID_HAVE_MC) + # snapshot add_executable (unit_snapshot src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp) target_link_libraries(unit_snapshot simgrid boost_unit_test_framework) ADD_TEST(unit_snapshot ${CMAKE_BINARY_DIR}/unit_snapshot --build_info=yes) @@ -109,6 +110,16 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND) APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}" ) + # PAGESTORE + add_executable (unit_PAGESTORE src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp) + target_link_libraries(unit_PAGESTORE simgrid boost_unit_test_framework) + ADD_TEST(unit_PAGESTORE ${CMAKE_BINARY_DIR}/unit_PAGESTORE --build_info=yes) + set_property( + TARGET unit_PAGESTORE + APPEND PROPERTY + INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}" + ) + endif() -- 2.20.1