diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-02-12 12:04:59 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-02-12 12:04:59 +0100 |
| commit | 39c593d02c4547bdf2508f5fde2f864b0bd0ba64 (patch) | |
| tree | 876677140d760da083bfb316142e3a72c2f44f2c /.travis.yml | |
| parent | 16897499c08dc37ca95ce484e0cb6457748407bf (diff) | |
| download | ATCD-39c593d02c4547bdf2508f5fde2f864b0bd0ba64.tar.gz | |
CIAO/DAnCE are not supported with acefortao
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 621a50a75ef..8795bea7278 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ compiler: - gcc env: matrix: - - CORBAEMICRO=1 - - CORBAECOMPACT=1 + - CORBAEMICRO=1 ACEFORTAO=0 + - CORBAECOMPACT=1 ACEFORTAO=0 - ACEFORTAO=1 - - CCMLW=1 - - CCMNOEVENT=1 - - ACETESTS=1 + - CCMLW=1 ACEFORTAO=0 + - CCMNOEVENT=1 ACEFORTAO=0 + - ACETESTS=1 ACEFORTAO=0 global: - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO @@ -24,7 +24,8 @@ before_install: before_script: - export - echo -e "#include \"ace/config-linux.h\"" >> $ACE_ROOT/ace/config.h - - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc + - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc + - if [ "$ACEFORTAO" == "0" ]; then echo -e "CIAO_TAO_DAnCE.mwc\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi - if [ "$ACETESTS" == "1" ]; then echo -e "\$(ACE_ROOT)/tests\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi - echo -e "}\n" >> $TRAVIS_BUILD_DIR/travis.mwc - if [ "$CORBAEMICRO" == "1" ]; then echo -e "corba_e_micro=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi |