diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-09-05 15:41:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 15:41:55 +0200 |
| commit | 219aa4971ebfb8b842e981fd466195b7bf36be4b (patch) | |
| tree | 5ccdd430d3f433403f135474068b3341280f5bd0 /.travis.yml | |
| parent | dbc5facc4067730a48fd0a0f7a7018a453dc991b (diff) | |
| parent | 564f8735931b2a13401b4c966894633fcb664e82 (diff) | |
| download | ATCD-219aa4971ebfb8b842e981fd466195b7bf36be4b.tar.gz | |
Merge branch 'master' into jwi-gcc7-travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f6c72914d33..0d6dd8415d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,9 @@ matrix: - libxerces-c-dev - libssl-dev - clang++-4.0 - env: COMPILER=clang++-4.0 VERSIONED=1 TAO=1 ACETESTS=1 + env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 + - os: osx + env: COMPILER=clang++ VERSIONED=1 TAO=1 ACETESTS=1 addons: apt: @@ -73,8 +75,9 @@ before_script: - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - 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 - - 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 + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi + - 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 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi @@ -94,5 +97,6 @@ before_script: script: - if [ "$FUZZ" == "1" ]; then exec perl $ACE_ROOT/bin/fuzz.pl; fi - perl $ACE_ROOT/bin/mwc.pl -type gnuace -workers 2 travis.mwc - - make -j 2 + - make -j 3 - perl $ACE_ROOT/bin/auto_run_tests.pl -l $TAO_ROOT/bin/travis-ci.lst + |