From fe8b3905888ace51cf03db495973c68c41884c8a Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Wed, 2 Nov 2016 11:03:20 -0700 Subject: [PATCH] adjustments to tests of --- CMake/CMakeLists.txt | 18 +++++--- include/boost/serialization/forward_list.hpp | 2 +- test/test_forward_list.cpp | 4 +- test/test_list.cpp | 28 +------------ test/test_list_ptrs.cpp | 43 +------------------- 5 files changed, 18 insertions(+), 77 deletions(-) diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt index 0459ea51..91d95edb 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -21,6 +21,7 @@ endif() # message(STATUS "compiler is ${CMAKE_CXX_COMPILER_ID}" ) +add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS}) if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ) add_definitions( -ftemplate-depth=300 ) @@ -106,22 +107,29 @@ endif() # end special note for Xcode ############################ +set(Boost_DEBUG true) +set(Boost_DETAILED_FAILURE_MSG true) + find_package(Boost REQUIRED COMPONENTS system filesystem) +message(STATUS "Boost_FOUND is ${Boost_FOUND}") + if(Boost_FOUND) + message(STATUS "Boost Found!") message(STATUS "Boost is ${BOOST_ROOT}") message(STATUS "Boost directories found at ${Boost_INCLUDE_DIRS}") message(STATUS "Boost libraries found at ${Boost_LIBRARY_DIRS}") + message(STATUS "Boost libraries prefix is ${Boost_LIB_PREFIX}") message(STATUS "Boost component libraries to be linked are ${Boost_LIBRARIES}") message(STATUS "Boost version found is ${Boost_VERSION}") include_directories("../include" "${Boost_INCLUDE_DIRS}") link_directories("${Boost_LIBRARY_DIRS}") -elseif() - message("Boost NOT Found!") +else() + message(STATUS "Boost NOT Found!") endif() if(Boost_USE_STATIC_LIBS) - message(STATUS "Building static libraries") + message(STATUS "Use static libraries") set(LINK_TYPE "STATIC") else() message(STATUS "Building shared libraries") @@ -327,12 +335,12 @@ archive_test(test_set A) archive_test(test_set_boost_unordered A) if(COMPILER_SUPPORTS_CXX11) archive_test(test_set_unordered A) -elseif() +else() archive_test(test_set_hashed A) endif() if(COMPILER_SUPPORTS_CXX11) archive_test(test_map_unordered A) -elseif() +else() archive_test(test_map_hashed A) endif() diff --git a/include/boost/serialization/forward_list.hpp b/include/boost/serialization/forward_list.hpp index 5d79b372..02b561dd 100644 --- a/include/boost/serialization/forward_list.hpp +++ b/include/boost/serialization/forward_list.hpp @@ -18,7 +18,7 @@ #include #ifdef BOOST_NO_CXX11_HDR_FORWARD_LIST -#error "not supported for versions earlier than c++11 +#error "This header depends upon the existence of #endif #include diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp index 5a162a58..eeb1ffb6 100644 --- a/test/test_forward_list.cpp +++ b/test/test_forward_list.cpp @@ -1,5 +1,5 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// test_list.cpp +// test_forward_list.cpp // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software @@ -19,7 +19,7 @@ namespace std{ #include #ifdef BOOST_NO_CXX11_HDR_FORWARD_LIST -#error this test presumes support for forward_list.hpp +#error This test presumes support for #endif #include diff --git a/test/test_list.cpp b/test/test_list.cpp index 1d3550d8..34ed7c8a 100644 --- a/test/test_list.cpp +++ b/test/test_list.cpp @@ -71,28 +71,6 @@ void test_slist(){ } #endif -#ifndef BOOST_NO_CXX11_HDR_FORWARD_LIST -#include -void test_forward_list(){ - const char * testfile = boost::archive::tmpnam(NULL); - std::forward_list aslist; - aslist.push_front(A()); - aslist.push_front(A()); - { - test_ostream os(testfile, TEST_STREAM_FLAGS); - test_oarchive oa(os, TEST_ARCHIVE_FLAGS); - oa << boost::serialization::make_nvp("aslist", aslist); - } - std::forward_list aslist1;{ - test_istream is(testfile, TEST_STREAM_FLAGS); - test_iarchive ia(is, TEST_ARCHIVE_FLAGS); - ia >> boost::serialization::make_nvp("aslist", aslist1); - } - BOOST_CHECK(aslist == aslist1); - std::remove(testfile); -} -#endif - int test_main( int /* argc */, char* /* argv */[] ) { test_list(); @@ -100,11 +78,7 @@ int test_main( int /* argc */, char* /* argv */[] ) #ifdef BOOST_HAS_SLIST test_slist(); #endif - - #ifndef BOOST_NO_CXX11_HDR_FORWARD_LIST - test_forward_list(); - #endif - + return EXIT_SUCCESS; } diff --git a/test/test_list_ptrs.cpp b/test/test_list_ptrs.cpp index 38994612..ec2cc909 100644 --- a/test/test_list_ptrs.cpp +++ b/test/test_list_ptrs.cpp @@ -127,43 +127,6 @@ void test_slist(){ } #endif -#ifndef BOOST_NO_CXX11_HDR_FORWARD_LIST -#include -void test_forward_list(){ - const char * testfile = boost::archive::tmpnam(NULL); - BOOST_REQUIRE(NULL != testfile); - - std::forward_list aslist; - { - test_ostream os(testfile, TEST_STREAM_FLAGS); - test_oarchive oa(os, TEST_ARCHIVE_FLAGS); - aslist.push_front(new A); - aslist.push_front(new A); - oa << boost::serialization::make_nvp("aslist", aslist); - } - std::forward_list aslist1; - { - test_istream is(testfile, TEST_STREAM_FLAGS); - test_iarchive ia(is, TEST_ARCHIVE_FLAGS); - ia >> boost::serialization::make_nvp("aslist", aslist1); - BOOST_CHECK( - std::equal(aslist.begin(),aslist.end(),aslist1.begin(),ptr_equal_to()) - ); - } - std::for_each( - aslist.begin(), - aslist.end(), - boost::checked_deleter() - ); - std::for_each( - aslist1.begin(), - aslist1.end(), - boost::checked_deleter() - ); - std::remove(testfile); -} -#endif - int test_main( int /* argc */, char* /* argv */[] ) { test_list(); @@ -171,11 +134,7 @@ int test_main( int /* argc */, char* /* argv */[] ) #ifdef BOOST_HAS_SLIST test_slist(); #endif - - #ifndef BOOST_NO_CXX11_HDR_FORWARD_LIST - test_forward_list(); - #endif - + return EXIT_SUCCESS; }