diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-22 13:18:25 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-22 13:18:25 +0200 |
| commit | 969777ea0c3172eb2a72b264ff3eea369176e100 (patch) | |
| tree | 2be4478ed716e15dae68539d5971a0fbebb0bb82 /.travis.yml | |
| parent | 29e1ab6a03fc2dcccf5d96bfb69752b271853820 (diff) | |
| download | ATCD-969777ea0c3172eb2a72b264ff3eea369176e100.tar.gz | |
Set clang++ as compiler envand disable inlining, this makes sure we compile all code in the core
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index baaaae71d14..7fe6a6f87be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,9 +35,9 @@ matrix: - libxerces-c-dev - libssl-dev - clang++-3.9 - env: COMPILER=clang++-3.9 VERSIONED=1 TAO=1 ACETESTS=1 + env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 - os: osx - env: COMPILER=clang++-3.9 VERSIONED=1 TAO=1 ACETESTS=1 + env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 addons: apt: @@ -76,7 +76,7 @@ before_script: - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - - echo -e "ipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU + - echo -e "inline=0\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - 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 |