diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 303ac48..6c3aba1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,7 +6,10 @@ # 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) +require-b2 5.0.1 ; import testing ; +import-search /boost/config/checks ; +import config : requires ; local gcc-flags = -Wsign-promo -Wconversion -Wsign-conversion -Wshadow -Wundef ; @@ -16,8 +19,6 @@ project /boost/throw_exception//boost_throw_exception /boost/core//boost_core - /boost/exception//boost_exception - extra msvc:on @@ -28,6 +29,8 @@ project clang:$(gcc-flags) ; +local with-boost-exception = /boost/exception//boost_exception [ requires cxx11_noexcept ] ; + run throw_exception_test.cpp ; run throw_exception_no_exceptions_test.cpp ; run throw_exception_no_integration_test.cpp ; @@ -37,27 +40,32 @@ compile-fail throw_exception_fail.cpp : off ; run throw_exception_test2.cpp ; -run throw_exception_test3.cpp ; -run throw_exception_test4.cpp ; -run throw_exception_test5.cpp ; +run throw_exception_test3.cpp + : : : $(with-boost-exception) ; +run throw_exception_test4.cpp + : : : $(with-boost-exception) ; +run throw_exception_test5.cpp + : : : $(with-boost-exception) ; lib lib1_throw : lib1_throw.cpp : LIB1_SOURCE=1 shared:LIB1_DYN_LINK=1 : : shared:LIB1_DYN_LINK=1 ; lib lib2_throw : lib2_throw.cpp : LIB2_SOURCE=1 shared:LIB2_DYN_LINK=1 : : shared:LIB2_DYN_LINK=1 ; lib lib3_throw : lib3_throw.cpp : LIB3_SOURCE=1 shared:LIB3_DYN_LINK=1 : : shared:LIB3_DYN_LINK=1 ; lib lib4_throw : lib4_throw.cpp : LIB4_SOURCE=1 shared:LIB4_DYN_LINK=1 : : shared:LIB4_DYN_LINK=1 ; -run throw_from_library_test.cpp lib1_throw lib2_throw lib3_throw lib4_throw : : : static : throw_from_library_static ; -run throw_from_library_test.cpp lib1_throw lib2_throw lib3_throw lib4_throw : : : shared darwin,norecover:no : throw_from_library_shared ; +run throw_from_library_test.cpp lib1_throw lib2_throw lib3_throw lib4_throw : : : $(with-boost-exception) static : throw_from_library_static ; +run throw_from_library_test.cpp lib1_throw lib2_throw lib3_throw lib4_throw : : : $(with-boost-exception) shared darwin,norecover:no : throw_from_library_shared ; run throw_exception_nx_test.cpp : : : off ; run throw_exception_nx_test2.cpp : : : off ; run throw_exception_nx_test3.cpp : : : off ; -run make_exception_ptr_test.cpp ; -run make_exception_ptr_test2.cpp ; +run make_exception_ptr_test.cpp + : : : $(with-boost-exception) ; +run make_exception_ptr_test2.cpp + : : : $(with-boost-exception) ; -run make_exception_ptr_nx_test.cpp : : : off ; -run make_exception_ptr_nx_test2.cpp : : : off ; +run make_exception_ptr_nx_test.cpp : : : $(with-boost-exception) off ; +run make_exception_ptr_nx_test2.cpp : : : $(with-boost-exception) off ; run throw_with_location_test.cpp ; run throw_with_location_test2.cpp ;