Use environment variable to set user-config.jam

This commit is contained in:
Daniel James
2017-04-20 23:39:44 +01:00
parent 2add451d63
commit 96f8f85eef

View File

@ -18,42 +18,40 @@ addons:
matrix: matrix:
include: include:
- compiler: gcc - compiler: gcc
env: BJAM_TOOLSET=gcc env: |
label="gcc C++03";
user_config="using gcc : : g++-4.8 -fsanitize=address -Werror --std=c++03 ;"
- compiler: gcc - compiler: gcc
env: BJAM_TOOLSET=gcc-std11 env: |
#- compiler: gcc label="gcc C++11";
# env: BJAM_TOOLSET=gcc-m32 user_config="using gcc : : g++-4.8 -fsanitize=address -Werror --std=c++11 ;"
- compiler: gcc - compiler: gcc
env: BJAM_TOOLSET=gcc-std11m32 env: |
#- compiler: clang label="gcc 32 bit C++11";
# env: BJAM_TOOLSET=clang user_config="using gcc : : g++-4.8 -m32 -fsanitize=address -Werror --std=c++11 ;"
- compiler: clang - compiler: clang
env: BJAM_TOOLSET=clang-std11 env: |
label="clang C++11";
user_config="using clang : : clang++ -fsanitize=address -Werror --std=c++11 ;"
# sanitized=address not available for 32-bit clang on travis.
- compiler: clang - compiler: clang
env: BJAM_TOOLSET=clang-m32 env: |
#- compiler: clang label="clang 32 bit";
# env: BJAM_TOOLSET=clang-std11m32 user_config="using clang : : clang++ -m32 -Werror --std=c++03 ;"
- compiler: gcc - compiler: gcc
env: BJAM_TOOLSET=gcc-interopable env: |
label="gcc C++03 interopable1";
user_config="using gcc : : g++-4.8 -fsanitize=address -Werror --std=c++03 -DBOOST_UNORDERED_INTEROPERABLE_NODES=1 ;"
- compiler: clang - compiler: clang
env: BJAM_TOOLSET=clang-interopable env: |
label="gcc C++11 interopable1";
user_config="using clang : : clang++ -fsanitize=address -Werror --std=c++03 -DBOOST_UNORDERED_INTEROPERABLE_NODES=1 ;"
before_script: before_script:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- touch Jamroot.jam - touch Jamroot.jam
- cd $HOME - cd $HOME
- | - echo $user_config > ~/user-config.jam
echo "using gcc : : g++-4.8 -Werror --std=c++03 -fsanitize=address ;" > ~/user-config.jam
echo "using gcc : std11 : g++-4.8 -Werror --std=c++11 -fsanitize=address ;" >> ~/user-config.jam
echo "using gcc : m32 : g++-4.8 -m32 -Werror -fsanitize=address ;" >> ~/user-config.jam
echo "using gcc : std11m32 : g++-4.8 -m32 -Werror --std=c++11 -fsanitize=address ;" >> ~/user-config.jam
echo "using clang : : clang++ -Werror --std=c++03 -fsanitize=address ;" >> ~/user-config.jam
echo "using clang : std11 : clang++ -Werror --std=c++11 -fsanitize=address ;" >> ~/user-config.jam
# sanitized=address not available for 32-bit clang on travis.
echo "using clang : m32 : clang++ -m32 -Werror --std=c++03 ;" >> ~/user-config.jam
echo "using clang : std11m32 : clang++ -m32 -Werror --std=c++11 ;" >> ~/user-config.jam
echo "using gcc : interopable : g++-4.8 -Werror --std=c++03 -fsanitize=address -DBOOST_UNORDERED_INTEROPERABLE_NODES=1 ;" >> ~/user-config.jam
echo "using clang : interopable : clang++ -Werror --std=c++11 -fsanitize=address -DBOOST_UNORDERED_INTEROPERABLE_NODES=1 ;" >> ~/user-config.jam
- cat ~/user-config.jam - cat ~/user-config.jam
- wget -O boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2 - wget -O boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2
- tar -xjf boost.tar.bz2 - tar -xjf boost.tar.bz2
@ -62,5 +60,5 @@ before_script:
script: script:
- cd ${TRAVIS_BUILD_DIR}/test - cd ${TRAVIS_BUILD_DIR}/test
- bjam ${BJAM_TOOLSET} include=${HOME}/boost include=${TRAVIS_BUILD_DIR}/include - bjam include=${HOME}/boost include=${TRAVIS_BUILD_DIR}/include
- xmllint --noout ${TRAVIS_BUILD_DIR}/doc/ref.xml - xmllint --noout ${TRAVIS_BUILD_DIR}/doc/ref.xml