diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-25 10:04:52 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-25 10:04:52 +0100 |
| commit | bd88bff5251237396f3904464dce67b17e049081 (patch) | |
| tree | 33dcdfed79e8524a3ffcc878543abebefd8206c6 /.travis.yml | |
| parent | 0473fca03c1c61cb66497f4fe9be9d9bc79d72ee (diff) | |
| download | ATCD-bd88bff5251237396f3904464dce67b17e049081.tar.gz | |
g++6 and clang3.9
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index c5c386888c7..8922fe4634c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO - MPC_ROOT=$TRAVIS_BUILD_DIR/MPC - LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH - - COMPILER=g++-5 + - COMPILER=g++-6 matrix: include: @@ -36,18 +36,18 @@ matrix: packages: - libxerces-c-dev - libssl-dev - - g++-5 + - g++-6 - compiler: clang addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 + - llvm-toolchain-precise-3.9 packages: - libxerces-c-dev - libssl-dev - - clang++-3.7 - env: COMPILER=clang++-3.7 + - clang++-3.9 + env: COMPILER=clang++-3.9 addons: apt: @@ -56,7 +56,7 @@ addons: packages: - libssl-dev - libxerces-c-dev - - g++-5 + - g++-6 before_install: - git clone --depth 1 git://github.com/DOCGroup/MPC.git @@ -88,6 +88,7 @@ before_script: - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst + - if [ "$CXX" == "g++" ]; then echo -e "c++11=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CXX" == "g++" ]; then @@ -100,6 +101,7 @@ before_script: - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features - cat $ACE_ROOT/ace/config.h - cat $ACE_ROOT/include/makeinclude/platform_macros.GNU + - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi script: - if [ "$FUZZ" == "1" ]; then exec perl $ACE_ROOT/bin/fuzz.pl; fi |