Remove the now useless unit_test_framework

diff --git a/.gitignore b/.gitignore
index 03461ca..34c3dfa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -940,9 +940,7 @@ teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest
 teshsuite/xbt/parmap_bench/parmap_bench
 teshsuite/xbt/parmap_test/parmap_test
 testall
 teshsuite/xbt/parmap_bench/parmap_bench
 teshsuite/xbt/parmap_test/parmap_test
 testall

-unit-mc-pagestore
-unit-mc-snapshot
-unit-tmgr
+unit-tests

 #########################################
 ## files touched to track the dependencies of java examples
 examples/deprecated/java/*/*/*_compiled
 #########################################
 ## files touched to track the dependencies of java examples
 examples/deprecated/java/*/*/*_compiled

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7703477..f9f8356 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,7 +254,7 @@ endif()
 set(_Boost_STACKTRACE_HEADERS           "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
 
 set(_Boost_STACKTRACE_HEADERS           "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
 

-find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace unit_test_framework)
+find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace)

 set(Boost_FOUND 1) # These components are optionals
 message(STATUS "Mandatory components found. SimGrid is compilable.")
 message(STATUS "Looking for optional Boost components:")
 set(Boost_FOUND 1) # These components are optionals
 message(STATUS "Mandatory components found. SimGrid is compilable.")
 message(STATUS "Looking for optional Boost components:")


@@ -276,12 +276,6 @@ else()
   set(HAVE_BOOST_CONTEXTS 0)
 endif()
 
   set(HAVE_BOOST_CONTEXTS 0)
 endif()
 

-if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  message(STATUS  "  unit_test_framework: found. Activating the Boost-based unit tests.")
-else()
-  message(STATUS  "  unit_test_framework: MISSING. Install libboost-test-dev (>= v1.59) to activate the Unit Tests.")
-endif()
-

 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)

diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc
index 3c54491..48756cc 100644 (file)
--- a/doc/doxygen/inside_tests.doc
+++ b/doc/doxygen/inside_tests.doc
@@ -58,9 +58,9 @@ make testall                    # Rebuild the test runner on need
 @section inside_tests_add_units Adding unit tests
 
 @warning this section is outdated. New unit tests should be written
 @section inside_tests_add_units Adding unit tests
 
 @warning this section is outdated. New unit tests should be written

-using the unit_test_framework component of Boost. There is no such
-example so far in our codebase, but that's definitely the way to go
-for the future. STOP USING XBT.
+using the Catch2 library, that is included in the source tree. Please
+check for examples, listed at the end of tools/cmake/Tests.cmake.
+STOP USING XBT.

 
 If you want to test a specific function or set of functions, you need
 a unit test. Edit the file tools/cmake/UnitTesting.cmake to
 
 If you want to test a specific function or set of functions, you need
 a unit test. Edit the file tools/cmake/UnitTesting.cmake to

diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp
index faefc3c..28721c0 100644 (file)
--- a/src/mc/remote/RemoteClient.cpp
+++ b/src/mc/remote/RemoteClient.cpp
@@ -73,7 +73,6 @@ static const std::vector<std::string> filtered_libraries = {
     "libboost_system",
     "libboost_thread",
     "libboost_timer",
     "libboost_system",
     "libboost_thread",
     "libboost_timer",

-    "libboost_unit_test_framework",

     "libbz2",
     "libc",
     "libc++",
     "libbz2",
     "libc",
     "libc++",