diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-23 19:45:47 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-06-23 19:45:47 +0200 |
| commit | a4bd31722e875ef8ab91cebfbe430cb86fa68ccf (patch) | |
| tree | 39b7e1152932cb38c6c171e2632f1bd7f91b978d | |
| parent | f335c4df62efa7e52712ab01b05d0f1641818077 (diff) | |
| parent | a6897f92e027038856e654a1d2bf03ac3afc93db (diff) | |
| download | ATCD-a4bd31722e875ef8ab91cebfbe430cb86fa68ccf.tar.gz | |
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index fbe10513e17..7fe6a6f87be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +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++ 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 @@ -96,3 +99,4 @@ script: - perl $ACE_ROOT/bin/mwc.pl -type gnuace -workers 2 travis.mwc - make -j 2 - perl $ACE_ROOT/bin/auto_run_tests.pl -l $TAO_ROOT/bin/travis-ci.lst + |