Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

1 files changed, 8 insertions, 24 deletions

diff --git a/libs/thread/test/test_shared_mutex_timed_locks_chrono.cpp b/libs/thread/test/test_shared_mutex_timed_locks_chrono.cpp
index fd6690c72..95dad0825 100644
--- a/libs/thread/test/test_shared_mutex_timed_locks_chrono.cpp
+++ b/libs/thread/test/test_shared_mutex_timed_locks_chrono.cpp
@@ -4,6 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_THREAD_VERSION 2
+#define BOOST_TEST_MODULE Boost.Threads: shared_mutex_locks_chrono test suite
 
 #include <boost/test/unit_test.hpp>
 #include <boost/thread/thread.hpp>
@@ -20,7 +21,7 @@
     }
 
 
-void test_timed_lock_shared_times_out_if_write_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_shared_times_out_if_write_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -56,7 +57,7 @@ void test_timed_lock_shared_times_out_if_write_lock_held()
     writer.join();
 }
 
-void test_timed_lock_shared_succeeds_if_no_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_shared_succeeds_if_no_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -85,7 +86,7 @@ void test_timed_lock_shared_succeeds_if_no_lock_held()
 
 }
 
-void test_timed_lock_shared_succeeds_if_read_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_shared_succeeds_if_read_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -121,7 +122,7 @@ void test_timed_lock_shared_succeeds_if_read_lock_held()
     reader.join();
 }
 
-void test_timed_lock_times_out_if_write_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_times_out_if_write_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -157,7 +158,7 @@ void test_timed_lock_times_out_if_write_lock_held()
     writer.join();
 }
 
-void test_timed_lock_succeeds_if_no_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_succeeds_if_no_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -186,7 +187,7 @@ void test_timed_lock_succeeds_if_no_lock_held()
 
 }
 
-void test_timed_lock_times_out_if_read_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_times_out_if_read_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -222,7 +223,7 @@ void test_timed_lock_times_out_if_read_lock_held()
     reader.join();
 }
 
-void test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held()
+BOOST_AUTO_TEST_CASE(test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held)
 {
     boost::shared_mutex rw_mutex;
     boost::mutex finish_mutex;
@@ -254,23 +255,6 @@ void test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held()
     reader.join();
 }
 
-
-boost::unit_test::test_suite* init_unit_test_suite(int, char*[])
-{
-    boost::unit_test::test_suite* test =
-        BOOST_TEST_SUITE("Boost.Threads: shared_mutex test suite");
-
-    test->add(BOOST_TEST_CASE(&test_timed_lock_shared_times_out_if_write_lock_held));
-    test->add(BOOST_TEST_CASE(&test_timed_lock_shared_succeeds_if_no_lock_held));
-    test->add(BOOST_TEST_CASE(&test_timed_lock_shared_succeeds_if_read_lock_held));
-    test->add(BOOST_TEST_CASE(&test_timed_lock_times_out_if_write_lock_held));
-    test->add(BOOST_TEST_CASE(&test_timed_lock_times_out_if_read_lock_held));
-    test->add(BOOST_TEST_CASE(&test_timed_lock_succeeds_if_no_lock_held));
-    test->add(BOOST_TEST_CASE(&test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held));
-
-    return test;
-}
-
 #else
 #error "Test not applicable: BOOST_THREAD_USES_CHRONO not defined for this platform as not supported"
 #endif