Preparation for session thread safety overhaul:

 - simplified SessionState, responsibility for protocol states now in Handlers
 - qpid::RefCounted, qpid::intrusive_ptr reference counting support.
 - build boost unit tests as single exe, speeds up testing.
 - fixed leak in AsynchIOAcceptor.cpp


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@590869 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 3 deletions

diff --git a/cpp/src/tests/logging.cpp b/cpp/src/tests/logging.cpp
index 1042e60077..a4e131ec57 100644
--- a/cpp/src/tests/logging.cpp
+++ b/cpp/src/tests/logging.cpp
@@ -16,18 +16,21 @@
  *
  */
 
-#define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>
-#include <boost/test/auto_unit_test.hpp>
+
 #include "test_tools.h"
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"
 #include "qpid/memory.h"
 #include "qpid/Options.h"
+
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/format.hpp>
+#include <boost/test/auto_unit_test.hpp>
+BOOST_AUTO_TEST_SUITE(logging);
+
 #include <exception>
-#include <time.h>
 #include <fstream>
+#include <time.h>
 
 
 using namespace std;
@@ -366,3 +369,5 @@ BOOST_AUTO_TEST_CASE(testLoggerConfigure) {
     log.close();
     unlink("logging.tmp");
 }
+
+BOOST_AUTO_TEST_SUITE_END();