Second attempt to use libc++ in TravisCi tests

This commit is contained in:
Antony Polukhin
2016-03-27 21:27:10 +03:00
parent 2d87bc6194
commit 7bd788c5d7

View File

@ -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