Merge pull request #297 from deanberris/0.11-devel

deanberris · deanberris · commit 99b91107ee4b · 2013-09-10T02:59:46.000-07:00
Proper fix for MIME roundtrip test failures in dynamic build mode.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,7 @@ if(CPP-NETLIB_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
   message ("Linking boost testing libs dynamically...")
   set(Boost_USE_STATIC_LIBS OFF)
   set(CPP-NETLIB_BUILD_SHARED_LIBS ON)
+  set(BUILD_SHARED_LIBS ON)
   add_definitions(-DBOOST_TEST_DYN_LINK)
 else()
   set(Boost_USE_STATIC_LIBS ON)
@@ -25,7 +26,6 @@ find_package( OpenSSL )
 find_package( Threads )
 set(CMAKE_VERBOSE_MAKEFILE true)
 
-set(BUILD_SHARED_LIBS ON)
 set(CPPNETLIB_VERSION_MAJOR 0) # MUST bump this whenever we make ABI-incompatible changes
 set(CPPNETLIB_VERSION_MINOR 10)
 set(CPPNETLIB_VERSION_PATCH 1)
diff --git a/libs/mime/test/CMakeLists.txt b/libs/mime/test/CMakeLists.txt
@@ -1,25 +1,10 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
-find_package ( Boost 1.41.0 COMPONENTS unit_test_framework )
 file ( COPY TestMessages DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
 
-option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
-
-if(CPP-NETLIB_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
-  message ("Linking boost testing libs dynamically...")
-  set(Boost_USE_STATIC_LIBS OFF)
-  set(CPP-NETLIB_BUILD_SHARED_LIBS ON)
-  add_definitions(-DBOOST_TEST_DYN_LINK)
-else()
-  set(Boost_USE_STATIC_LIBS ON)
-  set(CPP-NETLIB_BUILD_SHARED_LIBS OFF)
-  set(BUILD_SHARED_LIBS OFF)
-endif()
-
-set ( Boost_USE_MULTITHREADED ON )
-
 if ( Boost_FOUND )
     add_executable ( mime-roundtrip mime-roundtrip.cpp )
-    target_link_libraries ( mime-roundtrip ${Boost_LIBRARIES} )
+    target_link_libraries ( mime-roundtrip ${Boost_LIBRARIES}
+      ${CMAKE_THREAD_LIBS_INIT})
     add_test ( mime-roundtrip mime-roundtrip )
 endif ()
 
diff --git a/libs/mime/test/mime-roundtrip.cpp b/libs/mime/test/mime-roundtrip.cpp
@@ -12,7 +12,9 @@
 #include <boost/mime.hpp>
 #include <boost/bind.hpp>
 
-#define BOOST_TEST_MODULE MIME Roundtrip
+#ifdef BOOST_TEST_DYN_LINK
+#define BOOST_TEST_ALTERNATIVE_INIT_API
+#endif
 #include <boost/test/included/unit_test.hpp>
 
 #include <fstream>
@@ -73,16 +75,20 @@ namespace {
 		BOOST_CHECK_EQUAL ( readfile ( fileName ), from_mime ( mp ));
 		}
 	
-	void test_expected_parse_fail ( const char *fileName ) {
+	void test_expected_parse_fail ( const char *) {
 		}
 	
 }
 
 
 using namespace boost::unit_test;
 
+#ifdef BOOST_TEST_DYN_LINK
+bool init_unit_test()
+#else
 test_suite*
-init_unit_test_suite( int argc, char* argv[] ) 
+init_unit_test_suite( int, char** )
+#endif
 {
     framework::master_test_suite().add ( BOOST_TEST_CASE( boost::bind ( test_roundtrip, "TestMessages/00000001" )));
     framework::master_test_suite().add ( BOOST_TEST_CASE( boost::bind ( test_roundtrip, "TestMessages/00000019" )));
@@ -94,5 +100,16 @@ init_unit_test_suite( int argc, char* argv[] )
 
 //	test cases that fail
 //  framework::master_test_suite().add ( BOOST_TEST_CASE( boost::bind ( test_roundtrip, "TestMessages/0019-NoBoundary" )));
-    return 0;
+    return
+#ifdef BOOST_TEST_DYN_LINK
+    true;
+#else
+    0;
+#endif
 }
+
+#ifdef BOOST_TEST_DYN_LINK
+int main(int argc, char* argv[]) {
+  return unit_test_main(&init_unit_test, argc, argv);
+}
+#endif
