From 79e39d9d4351735f6bea1632fda1810e9cb6508f Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 1 Jul 2016 11:12:29 +0100 Subject: [PATCH] Copy build changes from the develop branch. --- .travis.yml | 4 +-- test/Jamfile.v2 | 73 +++++++++++++++++++++++++++++++++++++-- test/exception/Jamfile.v2 | 29 ---------------- test/unordered/Jamfile.v2 | 63 --------------------------------- 4 files changed, 73 insertions(+), 96 deletions(-) delete mode 100644 test/exception/Jamfile.v2 delete mode 100644 test/unordered/Jamfile.v2 diff --git a/.travis.yml b/.travis.yml index a005cd16..732a983f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,9 @@ matrix: before_script: - | - echo "using gcc : : g++-4.8 ;" > ~/user-config.jam + echo "using gcc : : g++-4.8 --std=c++03 ;" > ~/user-config.jam echo "using gcc : std11 : g++-4.8 --std=c++11 ;" >> ~/user-config.jam - echo "using clang : : clang++ ;" >> ~/user-config.jam + echo "using clang : : clang++ --std=c++03 ;" >> ~/user-config.jam echo "using clang : std11 : clang++ --std=c++11 ;" >> ~/user-config.jam - cat ~/user-config.jam - touch Jamroot.jam diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index a6ab923c..6f844095 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -5,5 +5,74 @@ import testing ; -build-project unordered ; -build-project exception ; +project unordered-test/unordered + : requirements + all + intel:on + # Would be nice to define -Wundef, but I'm getting warnings from + # Boost.Preprocessor on trunk. + gcc:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-long-long" + darwin:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" + ; + +#alias framework : /boost/test//boost_unit_test_framework ; +alias framework : ; + +test-suite unordered + : + [ run unordered/fwd_set_test.cpp ] + [ run unordered/fwd_map_test.cpp ] + [ run unordered/allocator_traits.cpp ] + [ run unordered/minimal_allocator.cpp ] + [ run unordered/compile_set.cpp ] + [ run unordered/compile_map.cpp ] + [ run unordered/noexcept_tests.cpp ] + [ run unordered/link_test_1.cpp unordered/link_test_2.cpp ] + [ run unordered/incomplete_test.cpp ] + [ run unordered/simple_tests.cpp ] + [ run unordered/equivalent_keys_tests.cpp ] + [ run unordered/constructor_tests.cpp ] + [ run unordered/copy_tests.cpp ] + [ run unordered/move_tests.cpp ] + [ run unordered/assign_tests.cpp ] + [ run unordered/insert_tests.cpp ] + [ run unordered/insert_stable_tests.cpp ] + [ run unordered/unnecessary_copy_tests.cpp ] + [ run unordered/erase_tests.cpp ] + [ run unordered/erase_equiv_tests.cpp ] + [ run unordered/find_tests.cpp ] + [ run unordered/at_tests.cpp ] + [ run unordered/bucket_tests.cpp ] + [ run unordered/load_factor_tests.cpp ] + [ run unordered/rehash_tests.cpp ] + [ run unordered/equality_tests.cpp ] + [ run unordered/swap_tests.cpp ] + + [ run unordered/compile_set.cpp : : + : BOOST_UNORDERED_USE_MOVE + : bmove_compile_set ] + [ run unordered/compile_map.cpp : : + : BOOST_UNORDERED_USE_MOVE + : bmove_compile_map ] + [ run unordered/copy_tests.cpp : : + : BOOST_UNORDERED_USE_MOVE + : bmove_copy ] + [ run unordered/move_tests.cpp : : + : BOOST_UNORDERED_USE_MOVE + : bmove_move ] + [ run unordered/assign_tests.cpp : : + : BOOST_UNORDERED_USE_MOVE + : bmove_assign ] + ; + +test-suite unordered-exception + : + [ run exception/constructor_exception_tests.cpp framework ] + [ run exception/copy_exception_tests.cpp framework ] + [ run exception/assign_exception_tests.cpp framework ] + [ run exception/insert_exception_tests.cpp framework ] + [ run exception/erase_exception_tests.cpp framework ] + [ run exception/rehash_exception_tests.cpp framework ] + [ run exception/swap_exception_tests.cpp framework : : : + BOOST_UNORDERED_SWAP_METHOD=2 ] + ; diff --git a/test/exception/Jamfile.v2 b/test/exception/Jamfile.v2 deleted file mode 100644 index c5d6f403..00000000 --- a/test/exception/Jamfile.v2 +++ /dev/null @@ -1,29 +0,0 @@ - -# Copyright 2006-2008 Daniel James. -# 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) - -import testing ; - -#alias framework : /boost/test//boost_unit_test_framework ; -alias framework : ; - -project unordered-test/exception-tests - : requirements - all - intel:on - gcc:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-long-long" - darwin:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" - ; - -test-suite unordered-exception - : - [ run constructor_exception_tests.cpp framework ] - [ run copy_exception_tests.cpp framework ] - [ run assign_exception_tests.cpp framework ] - [ run insert_exception_tests.cpp framework ] - [ run erase_exception_tests.cpp framework ] - [ run rehash_exception_tests.cpp framework ] - [ run swap_exception_tests.cpp framework : : : - BOOST_UNORDERED_SWAP_METHOD=2 ] - ; diff --git a/test/unordered/Jamfile.v2 b/test/unordered/Jamfile.v2 deleted file mode 100644 index 460ef135..00000000 --- a/test/unordered/Jamfile.v2 +++ /dev/null @@ -1,63 +0,0 @@ - -# Copyright 2006-2008 Daniel James. -# 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) - -import testing ; - -project unordered-test/unordered - : requirements - all - intel:on - # Would be nice to define -Wundef, but I'm getting warnings from - # Boost.Preprocessor on trunk. - gcc:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-long-long" - darwin:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" - ; - -test-suite unordered - : - [ run fwd_set_test.cpp ] - [ run fwd_map_test.cpp ] - [ run allocator_traits.cpp ] - [ run minimal_allocator.cpp ] - [ run compile_set.cpp ] - [ run compile_map.cpp ] - [ run noexcept_tests.cpp ] - [ run link_test_1.cpp link_test_2.cpp ] - [ run incomplete_test.cpp ] - [ run simple_tests.cpp ] - [ run equivalent_keys_tests.cpp ] - [ run constructor_tests.cpp ] - [ run copy_tests.cpp ] - [ run move_tests.cpp ] - [ run assign_tests.cpp ] - [ run insert_tests.cpp ] - [ run insert_stable_tests.cpp ] - [ run unnecessary_copy_tests.cpp ] - [ run erase_tests.cpp ] - [ run erase_equiv_tests.cpp ] - [ run find_tests.cpp ] - [ run at_tests.cpp ] - [ run bucket_tests.cpp ] - [ run load_factor_tests.cpp ] - [ run rehash_tests.cpp ] - [ run equality_tests.cpp ] - [ run swap_tests.cpp ] - - [ run compile_set.cpp : : - : BOOST_UNORDERED_USE_MOVE - : bmove_compile_set ] - [ run compile_map.cpp : : - : BOOST_UNORDERED_USE_MOVE - : bmove_compile_map ] - [ run copy_tests.cpp : : - : BOOST_UNORDERED_USE_MOVE - : bmove_copy ] - [ run move_tests.cpp : : - : BOOST_UNORDERED_USE_MOVE - : bmove_move ] - [ run assign_tests.cpp : : - : BOOST_UNORDERED_USE_MOVE - : bmove_assign ] - ;