Skip to content

Proper fix for MIME roundtrip test failures in dynamic build mode. #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2013
Merged

Proper fix for MIME roundtrip test failures in dynamic build mode. #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
19 changes: 2 additions & 17 deletions libs/mime/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ()

25 changes: 21 additions & 4 deletions libs/mime/test/mime-roundtrip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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" )));
Expand All @@ -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