From 7bd788c5d74efc06f2464908816d5ba89d391be7 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Sun, 27 Mar 2016 21:27:10 +0300 Subject: [PATCH] Second attempt to use libc++ in TravisCi tests --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef72ee7..e91e9d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,11 +38,12 @@ env: - BOOST_REMOVE=$(basename $TRAVIS_BUILD_DIR) matrix: - - CXX_STANDARD=c++98 TOOLSET=gcc - - CXX_STANDARD=c++11 TOOLSET=gcc-5 - - CXX_STANDARD=c++1y TOOLSET=gcc-5 - - CXX_STANDARD=c++1y -stdlib=libc++ linkfalgs=-stdlib=libc++ TOOLSET=clang - - CXX_STANDARD=c++11 -stdlib=libc++ linkfalgs=-stdlib=libc++ TOOLSET=clang + - CXX_FLAGS="cxxflags=\"--coverage -DBOOST_TRAVISCI_BUILD -std=c++98\" linkflags=--coverage" TOOLSET=gcc + - CXX_FLAGS="cxxflags=\"--coverage -DBOOST_TRAVISCI_BUILD -std=c++11\" linkflags=--coverage" TOOLSET=gcc-5 + - CXX_FLAGS="cxxflags=\"--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y\" linkflags=--coverage" TOOLSET=gcc-5 + - CXX_FLAGS="cxxflags=\"--coverage -DBOOST_TRAVISCI_BUILD -std=c++98 -stdlib=libc++\" linkfalgs=\"--coverage -stdlib=libc++\"" TOOLSET=clang + - CXX_FLAGS="cxxflags=\"--coverage -DBOOST_TRAVISCI_BUILD -std=c++11 -stdlib=libc++\" linkfalgs=\"--coverage -stdlib=libc++\"" TOOLSET=clang + - CXX_FLAGS="cxxflags=\"--coverage -DBOOST_TRAVISCI_BUILD -std=c++1y -stdlib=libc++\" linkfalgs=\"--coverage -stdlib=libc++\"" TOOLSET=clang ############################################################################################################### # From this point and below code is same for all the Boost libs @@ -90,7 +91,7 @@ before_install: script: # `--coverage` flags required to generate coverage info for Coveralls - - ../../../b2 testing.launcher=valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" + - ../../../b2 testing.launcher=valgrind address-model=64 architecture=x86 toolset=$TOOLSET $CXX_FLAGS after_success: # Copying Coveralls data to a separate folder