Split BOOST_TEST_TRAIT_SAME into its own header, rename to BOOST_TEST_SAME

.travis.yml

@@ -4,7 +4,9 @@
 
 language: cpp
 
-dist: xenial
+sudo: false
+
+dist: trusty
 
 branches:
   only:
@@ -127,12 +129,12 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: g++-9
-      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
+      compiler: g++-8
+      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
       addons:
         apt:
           packages:
-            - g++-9
+            - g++-8
           sources:
             - ubuntu-toolchain-r-test
 
@@ -141,31 +143,13 @@ matrix:
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
 
     - os: linux
-      dist: trusty
-      compiler: /usr/bin/clang++
-      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
-      addons:
-        apt:
-          packages:
-            - clang-3.3
-
-    - os: linux
-      dist: trusty
-      compiler: /usr/bin/clang++
-      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
-      addons:
-        apt:
-          packages:
-            - clang-3.4
-
-    - os: linux
-      dist: trusty
       compiler: clang++-3.5
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
+      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.5
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -176,16 +160,7 @@ matrix:
         apt:
           packages:
             - clang-3.6
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: clang++-3.7
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.7
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -196,6 +171,7 @@ matrix:
         apt:
           packages:
             - clang-3.8
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -206,6 +182,7 @@ matrix:
         apt:
           packages:
             - clang-3.9
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -218,6 +195,7 @@ matrix:
             - clang-4.0
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
 
     - os: linux
       compiler: clang++-5.0
@@ -228,6 +206,7 @@ matrix:
             - clang-5.0
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
 
     - os: linux
       compiler: clang++-6.0
@@ -238,6 +217,7 @@ matrix:
             - clang-6.0
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
 
     - os: linux
       compiler: clang++-7
@@ -248,7 +228,7 @@ matrix:
             - clang-7
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-7
+            - llvm-toolchain-trusty-7
 
     - os: linux
       compiler: clang++-8
@@ -259,9 +239,10 @@ matrix:
             - clang-8
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-8
+            - llvm-toolchain-trusty-8
 
     - os: linux
+      dist: xenial
       compiler: clang++-9
       env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a
       addons:
@@ -274,18 +255,18 @@ matrix:
               key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 
     - os: linux
-      compiler: clang++-8
-      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
+      compiler: clang++-6.0
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
       addons:
         apt:
           packages:
-            - clang-8
+            - clang-6.0
+            - libstdc++-5-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-8
+            - llvm-toolchain-trusty-6.0
 
     - os: linux
-      dist: trusty
       compiler: clang++-libc++
       env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
       addons:
@@ -295,7 +276,6 @@ matrix:
             - libc++abi-dev
 
     - os: linux
-      dist: trusty
       compiler: clang++-libc++
       env: UBSAN=1 TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
       addons:
@@ -325,36 +305,14 @@ matrix:
       osx_image: xcode10.1
 
     - os: linux
-      env: CMAKE_TEST=1
-      script:
-        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=core ..
-        - ctest --output-on-failure -R boost_core
-
-    - os: linux
+      compiler: g++
       env: CMAKE_SUBDIR_TEST=1
-      install:
-        - BOOST_BRANCH=develop
-        - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/config.git ../config
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/assert.git ../assert
       script:
-      - cd test/cmake_subdir_test && mkdir __build__ && cd __build__
+      - cd libs/core/test/cmake_subdir_test && mkdir __build__ && cd __build__
       - cmake ..
       - cmake --build .
       - cmake --build . --target check
 
-    - os: linux
-      env: CMAKE_INSTALL_TEST=1
-      script:
-        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="assert;config;core" -DCMAKE_INSTALL_PREFIX=~/.local ..
-        - cmake --build . --target install
-        - cd ../libs/core/test/cmake_install_test && mkdir __build__ && cd __build__
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
-        - cmake --build .
-        - cmake --build . --target check
-
 install:
   - BOOST_BRANCH=develop
   - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
@@ -370,7 +328,6 @@ install:
   - git submodule init libs/type_traits
   - git submodule init tools/build
   - git submodule init tools/boost_install
-  - git submodule init tools/cmake
   - git submodule update --jobs 4
   - cp -r $TRAVIS_BUILD_DIR/* libs/core
   - ./bootstrap.sh

CMakeLists.txt

@@ -1,10 +1,13 @@
-# Copyright 2018, 2019 Peter Dimov
+# Copyright 2018 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required(VERSION 3.5...3.16)
+# Partial (add_subdirectory only) and experimental CMake support
+# Subject to change; please do not rely on the contents of this file yet
 
-project(boost_core VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.5)
+
+project(BoostCore LANGUAGES CXX)
 
 add_library(boost_core INTERFACE)
 add_library(Boost::core ALIAS boost_core)
@@ -12,20 +15,7 @@ add_library(Boost::core ALIAS boost_core)
 target_include_directories(boost_core INTERFACE include)
 
 target_link_libraries(boost_core
-  INTERFACE
-    Boost::assert
-    Boost::config
+    INTERFACE
+        Boost::assert
+        Boost::config
 )
-
-if(BOOST_SUPERPROJECT_VERSION)
-
-  include(BoostInstall)
-  boost_install(TARGETS boost_core HEADER_DIRECTORY include/)
-
-endif()
-
-if(BUILD_TESTING)
-
-  add_subdirectory(test)
-
-endif()

include/boost/core/lightweight_test.hpp

@@ -30,10 +30,6 @@
 #include <cstring>
 #include <cstddef>
 
-#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
-# include <crtdbg.h>
-#endif
-
 //  IDE's like Visual Studio perform better if output goes to std::cout or
 //  some other stream, so allow user to configure output stream:
 #ifndef BOOST_LIGHTWEIGHT_TEST_OSTREAM
@@ -52,13 +48,7 @@ public:
         : report_(false)
         , errors_(0) {
 #if defined(_MSC_VER) && (_MSC_VER > 1310)
-        // disable message boxes on assert(), abort()
         ::_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
-#endif
-#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
-        // disable message boxes on iterator debugging violations
-        _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
-        _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
 #endif
     }
 

include/boost/core/lightweight_test_same.hpp

@@ -0,0 +1,112 @@
+#ifndef BOOST_CORE_LIGHTWEIGHT_TEST_SAME_HPP
+#define BOOST_CORE_LIGHTWEIGHT_TEST_SAME_HPP
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER)
+# pragma once
+#endif
+
+// boost/core/lightweight_test_same.hpp
+//
+// BOOST_TEST_TRAIT_SAME
+//
+// Copyright 2014 Peter Dimov
+//
+// Copyright 2019 Glen Joseph Fernandes
+// (glenjofe@gmail.com)
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+// Split from lightweight_test_trait because __VA_ARGS__
+// warns under -pedantic
+
+#include <boost/core/lightweight_test.hpp>
+#include <boost/core/typeinfo.hpp>
+#include <boost/core/is_same.hpp>
+#include <boost/config.hpp>
+
+namespace boost
+{
+
+namespace detail
+{
+
+template<class, int = 0> struct test_print { };
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T, 2>)
+{
+    return o << boost::core::demangled_name(BOOST_CORE_TYPEID(T));
+}
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T, 1>)
+{
+    return o << test_print<T, 2>();
+}
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<const T, 1>)
+{
+    return o << test_print<T, 2>() << " const";
+}
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<volatile T, 1>)
+{
+    return o << test_print<T, 2>() << " volatile";
+}
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<const volatile T, 1>)
+{
+    return o << test_print<T, 2>() << " const volatile";
+}
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T>)
+{
+    return o << test_print<T, 1>();
+}
+
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T&>)
+{
+    return o << test_print<T, 1>() << " &";
+}
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T&&>)
+{
+    return o << test_print<T, 1>() << " &&";
+}
+#endif
+
+template<class T> inline bool test_same_impl_( T )
+{
+    return T::value;
+}
+
+template<class T1, class T2> inline void test_same_impl( char const * types,
+  boost::core::is_same<T1, T2> same, char const * file, int line, char const * function )
+{
+    if( test_same_impl_( same ) )
+    {
+        test_results();
+    }
+    else
+    {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM
+            << file << "(" << line << "): test 'is_same<" << types << ">'"
+            << " failed in function '" << function
+            << "' ('" << test_print<T1>()
+            << "' != '" << test_print<T2>() << "')"
+            << std::endl;
+
+        ++test_results().errors();
+    }
+}
+
+} // namespace detail
+
+} // namespace boost
+
+#define BOOST_TEST_SAME(...) ( ::boost::detail::test_same_impl(#__VA_ARGS__, ::boost::core::is_same<__VA_ARGS__>(), __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
+
+#endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_SAME_HPP

include/boost/core/lightweight_test_trait.hpp

@@ -9,7 +9,8 @@
 
 // boost/core/lightweight_test_trait.hpp
 //
-// BOOST_TEST_TRAIT_TRUE, BOOST_TEST_TRAIT_FALSE, BOOST_TEST_TRAIT_SAME
+// BOOST_TEST_TRAIT_TRUE, BOOST_TEST_TRAIT_FALSE
+// (BOOST_TEST_TRAIT_SAME deprecated in favor of BOOST_TEST_SAME)
 //
 // Copyright 2014 Peter Dimov
 //
@@ -21,9 +22,11 @@
 // http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/lightweight_test_same.hpp>
 #include <boost/core/typeinfo.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
 
 namespace boost
 {
@@ -31,50 +34,6 @@ namespace boost
 namespace detail
 {
 
-template<class, int = 0> struct test_print { };
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T, 2>)
-{
-    return o << boost::core::demangled_name(BOOST_CORE_TYPEID(T));
-}
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T, 1>)
-{
-    return o << test_print<T, 2>();
-}
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<const T, 1>)
-{
-    return o << test_print<T, 2>() << " const";
-}
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<volatile T, 1>)
-{
-    return o << test_print<T, 2>() << " volatile";
-}
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<const volatile T, 1>)
-{
-    return o << test_print<T, 2>() << " const volatile";
-}
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T>)
-{
-    return o << test_print<T, 1>();
-}
-
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T&>)
-{
-    return o << test_print<T, 1>() << " &";
-}
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-template<class T> inline std::ostream& operator<<(std::ostream& o, test_print<T&&>)
-{
-    return o << test_print<T, 1>() << " &&";
-}
-#endif
-
 template< class T > inline void test_trait_impl( char const * trait, void (*)( T ),
   bool expected, char const * file, int line, char const * function )
 {
@@ -95,37 +54,17 @@ template< class T > inline void test_trait_impl( char const * trait, void (*)( T
     }
 }
 
-template<class T> inline bool test_trait_same_impl_( T )
-{
-    return T::value;
-}
-
-template<class T1, class T2> inline void test_trait_same_impl( char const * types,
-  boost::core::is_same<T1, T2> same, char const * file, int line, char const * function )
-{
-    if( test_trait_same_impl_( same ) )
-    {
-        test_results();
-    }
-    else
-    {
-        BOOST_LIGHTWEIGHT_TEST_OSTREAM
-            << file << "(" << line << "): test 'is_same<" << types << ">'"
-            << " failed in function '" << function
-            << "' ('" << test_print<T1>()
-            << "' != '" << test_print<T2>() << "')"
-            << std::endl;
-
-        ++test_results().errors();
-    }
-}
-
 } // namespace detail
 
 } // namespace boost
 
 #define BOOST_TEST_TRAIT_TRUE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, true, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
 #define BOOST_TEST_TRAIT_FALSE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, false, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
-#define BOOST_TEST_TRAIT_SAME(...) ( ::boost::detail::test_trait_same_impl(#__VA_ARGS__, ::boost::core::is_same<__VA_ARGS__>(), __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
+
+#if defined(BOOST_ALLOW_DEPRECATED_HEADERS)
+# define BOOST_TEST_TRAIT_SAME BOOST_TEST_SAME
+#else
+# define BOOST_TEST_TRAIT_SAME BOOST_PRAGMA_MESSAGE("BOOST_TEST_TRAIT_SAME is deprecated. Please use BOOST_TEST_SAME from <boost/core/lightweight_test_same.hpp> instead.") BOOST_TEST_SAME
+#endif
 
 #endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_TRAIT_HPP

test/CMakeLists.txt

@@ -1,13 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-
-include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
-
-if(HAVE_BOOST_TEST)
-
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::core Boost::static_assert Boost::type_traits Boost::throw_exception)
-
-endif()
-
-add_subdirectory(swap)

test/Jamfile.v2

@@ -55,12 +55,10 @@ compile-fail explicit_operator_bool_compile_fail_conv_pvoid.cpp ;
 compile-fail explicit_operator_bool_compile_fail_delete.cpp ;
 compile-fail explicit_operator_bool_compile_fail_shift.cpp ;
 
-compile ignore_unused_test.cpp
-  : <warnings>extra
-    <toolset>gcc:<warnings-as-errors>on
-    <toolset>clang:<warnings-as-errors>on
-    <toolset>msvc::<warnings-as-errors>on ;
-
+compile ignore_unused_test.cpp : <toolset>gcc-4.8:<cxxflags>"-Wunused-variable -Wunused-local-typedefs -Werror"
+                                   <toolset>gcc:<cxxflags>"-Wunused-variable -Werror"
+                                   <toolset>clang:<cxxflags>"-Wunused-variable -Werror"
+                                   <toolset>msvc:<cxxflags>"/we4100 /we4101" ;
 run sp_typeinfo_test.cpp ;
 run sp_typeinfo_test.cpp : : : <rtti>off : sp_typeinfo_test_no_rtti ;
 
@@ -77,8 +75,7 @@ run lightweight_test_gt_ge_test.cpp ;
 run lightweight_test_eq_nullptr.cpp ;
 run lightweight_test_test3.cpp ;
 run lightweight_test_test4.cpp ;
-run lightweight_test_test5.cpp
-  : : :
+run lightweight_test_test5.cpp : : :
     <warnings>extra
     <toolset>msvc:<warnings-as-errors>on
     <toolset>gcc:<warnings-as-errors>on
@@ -100,13 +97,16 @@ run-fail lightweight_test_fail8.cpp ;
 run-fail lightweight_test_fail8.cpp : : : <rtti>off : lightweight_test_fail8_no_rtti ;
 run-fail lightweight_test_fail9.cpp ;
 run-fail lightweight_test_fail10.cpp ;
-run-fail lightweight_test_fail11.cpp : ;
+run-fail lightweight_test_fail11.cpp ;
 run-fail lightweight_test_fail12.cpp ;
 run-fail lightweight_test_lt_fail.cpp ;
 run-fail lightweight_test_le_fail.cpp ;
 run-fail lightweight_test_gt_fail.cpp ;
 run-fail lightweight_test_ge_fail.cpp ;
 
+run lightweight_test_same.cpp ;
+run-fail lightweight_test_same_fail.cpp ;
+
 run is_same_test.cpp ;
 
 run typeinfo_test.cpp ;
@@ -115,12 +115,9 @@ run typeinfo_test.cpp : : : <rtti>off : typeinfo_test_no_rtti ;
 run iterator_test.cpp ;
 run detail_iterator_test.cpp ;
 
-run demangle_test.cpp
-  : : : <test-info>always_show_run_output ;
-
-run demangled_name_test.cpp
-  : : : <test-info>always_show_run_output ;
+run demangle_test.cpp  : : : <test-info>always_show_run_output ;
 
+run demangled_name_test.cpp  : : : <test-info>always_show_run_output ;
 run demangled_name_test.cpp  : : : <rtti>off <test-info>always_show_run_output : demangled_name_test_no_rtti ;
 
 run scoped_enum.cpp ;
@@ -167,10 +164,8 @@ run test_lib_typeid.cpp lib_typeid : : : <link>static : test_lib_typeid_static ;
 run test_lib_typeid.cpp lib_typeid : : : <link>shared <rtti>off : test_lib_typeid_shared_no_rtti ;
 run test_lib_typeid.cpp lib_typeid : : : <link>static <rtti>off : test_lib_typeid_static_no_rtti ;
 
-run uncaught_exceptions.cpp
-  : : : <exception-handling>on ;
-run uncaught_exceptions_np.cpp
-  : : : <exception-handling>on ;
+run uncaught_exceptions.cpp : : : <exception-handling>on ;
+run uncaught_exceptions_np.cpp : : : <exception-handling>on ;
 
 run no_exceptions_support_test.cpp ;
 run no_exceptions_support_test.cpp : : : <exception-handling>off : no_exceptions_support_test_nx ;

test/addressof_fn_test.cpp

@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/utility/addressof.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 
 void f0()

test/addressof_np_test.cpp

@@ -7,7 +7,7 @@
 //
 
 #include <boost/utility/addressof.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <cstddef>
 
 #if defined( BOOST_NO_CXX11_NULLPTR )

test/addressof_test.cpp

@@ -20,7 +20,7 @@
 #pragma warning(pop)
 #endif
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 template<class T> void scalar_test( T * = 0 )
 {

test/addressof_test2.cpp

@@ -22,7 +22,7 @@
 #pragma warning(pop)
 #endif
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 template<class T> void scalar_test( T * = 0 )
 {

test/cmake_install_test/CMakeLists.txt

@@ -1,17 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(cmake_install_test LANGUAGES CXX)
-
-find_package(boost_core REQUIRED)
-
-add_executable(quick ../quick.cpp)
-target_link_libraries(quick Boost::core)
-
-enable_testing()
-add_test(quick quick)
-
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_subdir_test/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required(VERSION 3.5...3.16)
+cmake_minimum_required(VERSION 3.5)
 
 project(cmake_subdir_test LANGUAGES CXX)
 

test/eif_constructors.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;

test/eif_dummy_arg_disambiguation.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;

test/eif_lazy.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if_c;
 using boost::lazy_enable_if_c;

test/eif_lazy_test.cpp

@@ -14,7 +14,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::lazy_enable_if;
 using boost::lazy_disable_if;

test/eif_member_templates.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;

test/eif_namespace_disambiguation.cpp

@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::is_arithmetic;

test/eif_no_disambiguation.cpp

@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::is_arithmetic;

test/eif_partial_specializations.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 using boost::enable_if_has_type;
 using boost::enable_if_c;

test/explicit_operator_bool_noexcept.cpp

@@ -18,7 +18,7 @@
 
 #if !defined(BOOST_NO_CXX11_NOEXCEPT)
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <boost/utility/explicit_operator_bool.hpp>
 
 namespace {

test/lightweight_test_fail.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail12.cpp

@@ -8,6 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
+#define BOOST_ALLOW_DEPRECATED_HEADERS
 #include <boost/core/lightweight_test_trait.hpp>
 #include <boost/config.hpp>
 

test/lightweight_test_fail2.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail3.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail4.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail5.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/lightweight_test_fail6.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/lightweight_test_same.cpp

@@ -0,0 +1,36 @@
+//
+// Test for BOOST_TEST_SAME
+//
+// Copyright 2014, 2019 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/core/lightweight_test_same.hpp>
+
+struct X
+{
+    typedef int type;
+};
+
+template<class T1, class T2> struct Y
+{
+    typedef T1 type;
+};
+
+int main()
+{
+    BOOST_TEST_SAME(X, X);
+    BOOST_TEST_SAME(void, void);
+    BOOST_TEST_SAME(char[1], char[1]);
+    BOOST_TEST_SAME(char[], char[]);
+    BOOST_TEST_SAME(void(), void());
+    BOOST_TEST_SAME(X::type, X::type);
+    BOOST_TEST_SAME(X::type, Y<int, float>::type);
+    BOOST_TEST_SAME(Y<int, float>, Y<int, float>);
+    BOOST_TEST_SAME(Y<void, float>::type, void);
+
+    return boost::report_errors();
+}

test/lightweight_test_same_fail.cpp

@@ -0,0 +1,68 @@
+//
+// Negative test for BOOST_TEST_SAME
+//
+// Copyright 2014, 2019 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/core/lightweight_test_same.hpp>
+#include <boost/config.hpp>
+
+struct X
+{
+    typedef int type;
+};
+
+template<class T1, class T2> struct Y
+{
+    typedef T1 type;
+};
+
+typedef int I1;
+typedef const int I2;
+typedef volatile int I3;
+typedef const volatile int I4;
+typedef int& I5;
+typedef const int& I6;
+typedef volatile int& I7;
+typedef const volatile int& I8;
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+typedef int&& I9;
+typedef const int&& I10;
+typedef volatile int&& I11;
+typedef const volatile int&& I12;
+#endif
+
+int main()
+{
+    BOOST_TEST_SAME(char[1], char[2]);
+    BOOST_TEST_SAME(char[1], char[]);
+    BOOST_TEST_SAME(char[1], char*);
+    BOOST_TEST_SAME(void(), void(int));
+    BOOST_TEST_SAME(void(), void(*)());
+    BOOST_TEST_SAME(X, void);
+    BOOST_TEST_SAME(X::type, void);
+    BOOST_TEST_SAME(X, Y<void, void>);
+    BOOST_TEST_SAME(X::type, Y<float, int>::type);
+    BOOST_TEST_SAME(Y<int, float>, Y<int, double>);
+    BOOST_TEST_SAME(I1, I2);
+    BOOST_TEST_SAME(I3, I4);
+    BOOST_TEST_SAME(I5, I6);
+    BOOST_TEST_SAME(I7, I8);
+
+    int expected = 14;
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+
+    BOOST_TEST_SAME(I9, I10);
+    BOOST_TEST_SAME(I11, I12);
+
+    expected += 2;
+
+#endif
+
+    return boost::report_errors() == expected;
+}

test/lightweight_test_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <vector>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/lightweight_test_test4.cpp

@@ -8,6 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
+#define BOOST_ALLOW_DEPRECATED_HEADERS
 #include <boost/core/lightweight_test_trait.hpp>
 
 struct X

test/ref_ct_test.cpp

@@ -9,7 +9,7 @@
 #include <boost/ref.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/config/workaround.hpp>
+#include <boost/detail/workaround.hpp>
 
 namespace {
 

test/ref_fn_test.cpp

@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 
 void f0()

test/ref_test.cpp

@@ -7,7 +7,7 @@
 // see 'ref_ct_test.cpp' for compile-time part
 
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 namespace {
 using namespace boost;

test/sp_typeinfo_test.cpp

@@ -11,7 +11,7 @@
 #define BOOST_ALLOW_DEPRECATED_HEADERS
 
 #include <boost/detail/sp_typeinfo.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <iostream>
 
 int main()

test/swap/CMakeLists.txt

@@ -1,11 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
-
-include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
-
-if(HAVE_BOOST_TEST)
-
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::core)
-
-endif()

test/swap/Jamfile.v2

@@ -7,31 +7,65 @@
 # bring in rules for testing
 import testing ;
 
-compile swap_root_header_1.cpp ;
-compile swap_root_header_2.cpp ;
-compile swap_lib_header_1.cpp ;
-compile swap_lib_header_2.cpp ;
-compile swap_mixed_headers_1.cpp ;
-compile swap_mixed_headers_2.cpp ;
+local compile_tests =
+    root_header_1.cpp
+    root_header_2.cpp
+    lib_header_1.cpp
+    lib_header_2.cpp
+    mixed_headers_1.cpp
+    mixed_headers_2.cpp
+    ;
 
-compile-fail swap_const_wrapper_fail.cpp ;
+local compile_fail_tests =
+    const_wrapper_fail.cpp ;
 
-run swap_primitive.cpp ;
-run swap_specialized_in_boost.cpp ;
-run swap_specialized_in_global.cpp ;
-run swap_specialized_in_other.cpp ;
-run swap_specialized_in_std.cpp ;
-run swap_specialized_in_boost_and_other.cpp ;
-run swap_std_bitset.cpp ;
-run swap_std_dateorder.cpp ;
-run swap_std_string.cpp ;
-run swap_std_typeinfo_ptr.cpp ;
-run swap_std_vector_of_boost.cpp ;
-run swap_std_vector_of_global.cpp ;
-run swap_std_vector_of_other.cpp ;
-run swap_no_ambiguity_in_boost.cpp ;
-run swap_array_of_array_of_class.cpp ;
-run swap_array_of_array_of_int.cpp ;
-run swap_array_of_class.cpp ;
-run swap_array_of_int.cpp ;
-run swap_array_of_template.cpp ;
+local run_tests =
+    primitive.cpp
+    specialized_in_boost.cpp
+    specialized_in_global.cpp
+    specialized_in_other.cpp
+    specialized_in_std.cpp
+    specialized_in_boost_and_other.cpp
+    std_bitset.cpp
+    std_dateorder.cpp
+    std_string.cpp
+    std_typeinfo_ptr.cpp
+    std_vector_of_boost.cpp
+    std_vector_of_global.cpp
+    std_vector_of_other.cpp
+    no_ambiguity_in_boost.cpp
+    array_of_array_of_class.cpp
+    array_of_array_of_int.cpp
+    array_of_class.cpp
+    array_of_int.cpp
+    array_of_template.cpp
+    ;
+
+rule test_all
+{
+    local all_rules ;
+    local file ;
+
+    for file in $(compile_tests)
+    {
+        local test_name = [ MATCH "([^.]*).cpp$" : $(file) ] ;
+        all_rules += [ compile $(file) : : "swap-$(test_name)" ] ;
+    }
+
+    for file in $(compile_fail_tests)
+    {
+        local test_name = [ MATCH "([^.]*).cpp$" : $(file) ] ;
+        all_rules += [ compile-fail $(file) : : "swap-$(test_name)" ] ;
+    }
+
+    for file in $(run_tests)
+    {
+        local test_name = [ MATCH "([^.]*).cpp$" : $(file) ] ;
+        all_rules += [ run $(file) : : : : "swap-$(test_name)" ] ;
+    }
+
+    #ECHO All rules: $(all_rules) ;
+    return $(all_rules) ;
+}
+
+test-suite core/swap : [ test_all r ] ;