diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-10-31 19:09:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 19:09:05 +0100 |
| commit | f028939b414a8fb156fbdd3452f804ab182e97ab (patch) | |
| tree | 84186f10e81e3a99ac39480677187fc530c014e3 | |
| parent | fb9da424c10311a44798a773db139fef3dae98bb (diff) | |
| parent | 1cc76b598c24abc9816ddff49f776182b720b7e6 (diff) | |
| download | ATCD-f028939b414a8fb156fbdd3452f804ab182e97ab.tar.gz | |
Merge pull request #320 from jwillemsen/master
Attempt to test FACE configuration
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index b11eb3e812e..9c2f20e11a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,16 @@ compiler: env: matrix: - FUZZ=1 - - CORBAEMICRO=1 ACEFORTAO=0 - - CORBAECOMPACT=1 ACEFORTAO=0 - - ACEFORTAO=1 - - CCMLW=0 ACEFORTAO=0 - - CCMLW=1 ACEFORTAO=0 - - CCMNOEVENT=1 ACEFORTAO=0 - - ACETESTS=1 ACEFORTAO=0 - - USES_WCHAR=1 - - VERSIONED=1 + - CORBAEMICRO=1 ACEFORTAO=0 TAO=1 + - CORBAECOMPACT=1 ACEFORTAO=0 TAO=1 + - ACEFORTAO=1 TAO=1 + - CCMLW=0 ACEFORTAO=0 TAO=1 + - CCMLW=1 ACEFORTAO=0 TAO=1 + - CCMNOEVENT=1 ACEFORTAO=0 TAO=1 + - ACETESTS=1 ACEFORTAO=0 TAO=1 + - USES_WCHAR=1 TAO=1 + - VERSIONED=1 TAO=1 + - ACETESTS=1 FACE=1 ACE=1 TAO=0 global: - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO @@ -36,9 +37,12 @@ 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 - - echo -e "workspace {\n\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc + - echo -e "workspace {\n" >> $TRAVIS_BUILD_DIR/travis.mwc + - if [ "$TAO" == "1" ]; then echo -e "\$(TAO_ROOT)/TAO_ACE.mwc\n\$(TAO_ROOT)/tests/Hello\n" >> $TRAVIS_BUILD_DIR/travis.mwc; fi + - if [ "$ACE" == "1" ]; then echo -e "\$(ACE_ROOT)/ace/ace.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 [ "$FACE" == "1" ]; then echo -e "#define ACE_FACE_SAFETY_BASE" >> $ACE_ROOT/ace/config.h; fi - if [ "$CORBAEMICRO" == "1" ]; then echo -e "corba_e_micro=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi - if [ "$CORBAEMICRO" == "1" ]; then echo -e "corba_e_micro=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$CORBAECOMPACT" == "1" ]; then echo -e "corba_e_compact=1" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi |