From 4ef2b1ebeb13dd6d6c7d687b76cdf6e52dc2db45 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 6 Jan 2018 13:57:39 +0000 Subject: [PATCH] Use cxxstd in travis --- .travis.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d786f8d..1743f55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,16 +12,12 @@ matrix: include: - compiler: gcc env: | - USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++03 ;" - - compiler: gcc - env: | - USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++11 ;" + USER_CONFIG="using gcc : : g++-4.8 -Werror ;" + CXXSTD=03,11 - compiler: clang env: | - USER_CONFIG="using clang : : clang++ -Werror --std=c++03 ;" - - compiler: clang - env: | - USER_CONFIG="using clang : : clang++ -Werror --std=c++11 ;" + USER_CONFIG="using clang : : clang++ -Werror ;" + CXXSTD=03,11 - compiler: clang env: | USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" @@ -68,10 +64,10 @@ before_script: script: - cd ${TRAVIS_BUILD_DIR}/test - - ${HOME}/opt/bin/b2 -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 cxxstd=$CXXSTD -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include - cd ${TRAVIS_BUILD_DIR}/forward/test - - ${HOME}/opt/bin/b2 -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 cxxstd=$CXXSTD -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include - cd ${TRAVIS_BUILD_DIR}/factory/test - - ${HOME}/opt/bin/b2 -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 cxxstd=$CXXSTD -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include - cd ${TRAVIS_BUILD_DIR}/overloaded_function/test - - ${HOME}/opt/bin/b2 -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 cxxstd=$CXXSTD -q ${${HOME}/opt/bin/b2_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include