diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-03 09:15:27 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-10-03 09:15:27 +0200 |
| commit | 1fb4e6a41f72f76bc319e8226d55ead210803be3 (patch) | |
| tree | 1f23664a8424cc946abff08794c89d7a573d8bbc /.travis.yml | |
| parent | c85c5fd9e7055c9ec585e8a8f47035370354024d (diff) | |
| download | ATCD-1fb4e6a41f72f76bc319e8226d55ead210803be3.tar.gz | |
Attempt to fix osx
* .travis.yml:
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 95baf1a4c4a..43ae8f2eb79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ branches: before_script: - export - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "#include \"ace/config-macosx.h\"" >> $ACE_ROOT/ace/config.h; fi - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc - if [ "$ACETESTS" == "1" ]; then echo -e "\$(ACE_ROOT)/tests\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi - echo -e "}\n" >> $TRAVIS_BUILD_DIR/travis.mwc @@ -54,7 +54,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 [ "$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" == "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 echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - cat $TRAVIS_BUILD_DIR/travis.mwc - cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features @@ -66,4 +66,3 @@ 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 - |