replaced BOOST_TEST with BOOST_CHECK_EQUAL/BOOS_CHECK_MESSAGE.

diff --git a/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp b/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp
index a1ec5cc..d9a150d 100644 (file)
--- a/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp
+++ b/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp
@@ -1,7 +1,7 @@
 /****************************************************
 TODO: comment
 ****************************************************/
-#define BOOST_TEST_MODULE pageStore
+#define BOOST_TEST_MODULE PAGESTORE
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 
@@ -52,41 +52,41 @@ BOOST_AUTO_TEST_CASE(pageStore) {
   std::size_t pagesize = (size_t) getpagesize();
   std::unique_ptr<PageStore> store = std::unique_ptr<PageStore>(new simgrid::mc::PageStore(500));
   void* data = getpage();
-  BOOST_TEST(store->size()==0, "Bad size");
+  BOOST_CHECK_MESSAGE(store->size()==0, "Bad size");
 
   // xbt_test_add("Store the page once");
   new_content(data, pagesize);
   size_t pageno1 = store->store_page(data);
-  BOOST_TEST(store->get_ref(pageno1)==1, "Bad refcount");
+  BOOST_CHECK_MESSAGE(store->get_ref(pageno1)==1, "Bad refcount");
   const void* copy = store->get_page(pageno1);
-  BOOST_TEST(::memcmp(data, copy, pagesize)==0, "Page data should be the same");
-  BOOST_TEST(store->size()==1, "Bad size");
+  BOOST_CHECK_MESSAGE(::memcmp(data, copy, pagesize)==0, "Page data should be the same");
+  BOOST_CHECK_MESSAGE(store->size()==1, "Bad size");
 
   // xbt_test_add("Store the same page again");
   size_t pageno2 = store->store_page(data);
-  BOOST_TEST(pageno1==pageno2, "Page should be the same");
-  BOOST_TEST(store->get_ref(pageno1)==2, "Bad refcount");
-  BOOST_TEST(store->size()==1, "Bad size");
+  BOOST_CHECK_MESSAGE(pageno1==pageno2, "Page should be the same");
+  BOOST_CHECK_MESSAGE(store->get_ref(pageno1)==2, "Bad refcount");
+  BOOST_CHECK_MESSAGE(store->size()==1, "Bad size");
 
   // xbt_test_add("Store a new page");
   new_content(data, pagesize);
   size_t pageno3 = store->store_page(data);
-  BOOST_TEST(pageno1 != pageno3, "New page should be different");
-  BOOST_TEST(store->size()==2, "Bad size");
+  BOOST_CHECK_MESSAGE(pageno1 != pageno3, "New page should be different");
+  BOOST_CHECK_MESSAGE(store->size()==2, "Bad size");
 
   // xbt_test_add("Unref pages");
   store->unref_page(pageno1);
-  BOOST_TEST(store->get_ref(pageno1)==1, "Bad refcount");
-  BOOST_TEST(store->size()==2, "Bad size");
+  BOOST_CHECK_MESSAGE(store->get_ref(pageno1)==1, "Bad refcount");
+  BOOST_CHECK_MESSAGE(store->size()==2, "Bad size");
   store->unref_page(pageno2);
-  BOOST_TEST(store->size()==1, "Bad size");
+  BOOST_CHECK_MESSAGE(store->size()==1, "Bad size");
 
   // xbt_test_add("Reallocate page");
   new_content(data, pagesize);
   size_t pageno4 = store->store_page(data);
-  BOOST_TEST(pageno1 == pageno4, "Page was not reused");
-  BOOST_TEST(store->get_ref(pageno4)==1, "Bad refcount");
-  BOOST_TEST(store->size()==2, "Bad size");
+  BOOST_CHECK_MESSAGE(pageno1 == pageno4, "Page was not reused");
+  BOOST_CHECK_MESSAGE(store->get_ref(pageno4)==1, "Bad refcount");
+  BOOST_CHECK_MESSAGE(store->size()==2, "Bad size");
 }
 
 /*******************************/

diff --git a/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp b/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp
index e64472c..6b8d25e 100644 (file)
--- a/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp
+++ b/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp
@@ -5,6 +5,7 @@ TODO: comment
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 
+
 // /*******************************/
 // /* GENERATED FILE, DO NOT EDIT */
 // /*******************************/
@@ -40,10 +41,10 @@ static int test_snapshot(bool sparse_checkpoint);
 
 BOOST_AUTO_TEST_SUITE(Snapshots)
 BOOST_AUTO_TEST_CASE(flat_snapshots) {
-  BOOST_TEST(test_snapshot(0) == 1);
+  BOOST_CHECK_EQUAL(test_snapshot(0), 1);
 }
 BOOST_AUTO_TEST_CASE(page_snapshots) {
-  BOOST_TEST(test_snapshot(1) == 1);
+  BOOST_CHECK_EQUAL(test_snapshot(1), 1);
 }
 BOOST_AUTO_TEST_SUITE_END()
 
@@ -51,8 +52,8 @@ static int test_snapshot(bool sparse_checkpoint) {
 
   // xbt_test_add("Initialization");
   _sg_mc_sparse_checkpoint = sparse_checkpoint;
-  BOOST_TEST(xbt_pagesize == getpagesize());
-  BOOST_TEST(1 << xbt_pagebits == xbt_pagesize);
+  BOOST_CHECK_EQUAL(xbt_pagesize, getpagesize());
+  BOOST_CHECK_EQUAL(1 << xbt_pagebits, xbt_pagesize);
 
   std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(getpid(), -1));
   process->init();
@@ -63,7 +64,7 @@ static int test_snapshot(bool sparse_checkpoint) {
     // Store region page(s):
     size_t byte_size = n * xbt_pagesize;
     void* source = mmap(nullptr, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-    BOOST_TEST(source!=MAP_FAILED, "Could not allocate source memory");
+    BOOST_CHECK_MESSAGE(source!=MAP_FAILED, "Could not allocate source memory");
 
     // Init memory and take snapshots:
     init_memory(source, byte_size);
@@ -76,30 +77,30 @@ static int test_snapshot(bool sparse_checkpoint) {
       simgrid::mc::RegionType::Unknown, source, source, byte_size);
 
     void* destination = mmap(nullptr, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-    BOOST_TEST(source!=MAP_FAILED, "Could not allocate destination memory");
+    BOOST_CHECK_MESSAGE(source!=MAP_FAILED, "Could not allocate destination memory");
 
     // xbt_test_add("Reading whole region data for %i page(s)", n);
     const void* read = MC_region_read(&region, destination, source, byte_size);
-    BOOST_TEST(not memcmp(source, read, byte_size), "Mismatch in MC_region_read()");
+    BOOST_CHECK_MESSAGE(not memcmp(source, read, byte_size), "Mismatch in MC_region_read()");
 
     // xbt_test_add("Reading parts of region data for %i page(s)", n);
     for(int j=0; j!=100; ++j) {
       size_t offset = rand() % byte_size;
       size_t size = rand() % (byte_size - offset);
       const void* read = MC_region_read(&region, destination, (const char*) source+offset, size);
-      BOOST_TEST(not memcmp((char*)source + offset, read, size), "Mismatch in MC_region_read()");
+      BOOST_CHECK_MESSAGE(not memcmp((char*)source + offset, read, size), "Mismatch in MC_region_read()");
     }
 
     // xbt_test_add("Compare whole region data for %i page(s)", n);
 
-    BOOST_TEST(MC_snapshot_region_memcmp(source, &region0, source, &region, byte_size),
+    BOOST_CHECK_MESSAGE(MC_snapshot_region_memcmp(source, &region0, source, &region, byte_size),
       "Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
 
     // xbt_test_add("Compare parts of region data for %i page(s) with itself", n);
     for(int j=0; j!=100; ++j) {
       size_t offset = rand() % byte_size;
       size_t size = rand() % (byte_size - offset);
-      BOOST_TEST(
+      BOOST_CHECK_MESSAGE(
           not MC_snapshot_region_memcmp((char*)source + offset, &region, (char*)source + offset, &region, size),
           "Mismatch in MC_snapshot_region_memcmp()");
     }
@@ -109,7 +110,7 @@ static int test_snapshot(bool sparse_checkpoint) {
       memcpy(source, &mc_model_checker, sizeof(void*));
       simgrid::mc::RegionSnapshot region2 = simgrid::mc::sparse_region(
         simgrid::mc::RegionType::Unknown, source, source, byte_size);
-      BOOST_TEST(MC_region_read_pointer(&region2, source) == mc_model_checker,
+      BOOST_CHECK_MESSAGE(MC_region_read_pointer(&region2, source) == mc_model_checker,
         "Mismtach in MC_region_read_pointer()");
     }