import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / mpi / test / gather_test.cpp

diff --git a/ceph/src/boost/libs/mpi/test/gather_test.cpp b/ceph/src/boost/libs/mpi/test/gather_test.cpp
index faec09930a3e4ff6c8828d259f71a12d6f25ca23..9bef7acd2e4f7adb02198e16c2204e4fc8dc48d0 100644 (file)
--- a/ceph/src/boost/libs/mpi/test/gather_test.cpp
+++ b/ceph/src/boost/libs/mpi/test/gather_test.cpp
@@ -9,13 +9,15 @@
 #include <boost/mpi/collectives/gatherv.hpp>
 #include <boost/mpi/communicator.hpp>
 #include <boost/mpi/environment.hpp>
-#include <boost/test/minimal.hpp>
 #include "gps_position.hpp"
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/list.hpp>
 #include <boost/iterator/counting_iterator.hpp>
 #include <boost/lexical_cast.hpp>
 
+#define BOOST_TEST_MODULE mpi_gather
+#include <boost/test/included/unit_test.hpp>
+
 using boost::mpi::communicator;
 
 template<typename Generator>
@@ -146,10 +148,9 @@ struct string_list_generator
   }
 };
 
-int test_main(int argc, char* argv[])
+BOOST_AUTO_TEST_CASE(gather_check)
 {
-  boost::mpi::environment env(argc, argv);
-
+  boost::mpi::environment env;
   communicator comm;
 
   gather_test(comm, int_generator(), "integers");
@@ -161,6 +162,4 @@ int test_main(int argc, char* argv[])
   gatherv_test(comm, gps_generator(), "GPS positions");
   gatherv_test(comm, string_generator(), "string");
   gatherv_test(comm, string_list_generator(), "list of strings");
-
-  return 0;
 }