Merge branch 'develop'

Just changes to build setup.
This commit is contained in:
Daniel James
2016-07-30 12:02:35 +01:00
4 changed files with 5 additions and 17 deletions

View File

@ -17,19 +17,19 @@ addons:
matrix:
include:
- compiler: gcc
env: BJAM_TOOLSET=gcc
env: BJAM_TOOLSET=gcc-std03
- compiler: gcc
env: BJAM_TOOLSET=gcc-std11
- compiler: clang
env: BJAM_TOOLSET=clang
env: BJAM_TOOLSET=clang-std03
- compiler: clang
env: BJAM_TOOLSET=clang-std11
before_script:
- |
echo "using gcc : : g++-4.8 ;" > ~/user-config.jam
echo "using gcc : std03 : 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 : std03 : 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

View File

@ -19,6 +19,7 @@ project hash-tests
test-suite functional/hash
:
[ compile check_float_funcs.cpp ]
[ run hash_fwd_test_1.cpp ]
[ run hash_fwd_test_2.cpp ]
[ run hash_number_test.cpp ]

View File

@ -1,13 +0,0 @@
# Copyright 2012 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 ;
build-project .. ;
test-suite functional/hash/config
:
[ compile check_float_funcs.cpp ]
;