Skip to content

Commit ae5f035

Browse files
committed
Travis CI: enabled DDS Security on Linux
1 parent 2ee6d81 commit ae5f035

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

.travis.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,20 @@ env:
1010
- DDS_ROOT=$TRAVIS_BUILD_DIR/OpenDDS
1111
- MPC_ROOT=$TRAVIS_BUILD_DIR/MPC
1212
- LD_LIBRARY_PATH=$ACE_ROOT/lib:$DDS_ROOT/lib:$LD_LIBRARY_PATH
13-
- NODE_VERSION="8"
13+
- NODE_VERSION=10
1414
matrix:
1515
include:
16-
- {os: osx, osx_image: xcode9.1, compiler: clang, env: 'COMPILER=clang++ NO_INLINE=1 OPENDDS_BRANCH=master'}
17-
- {os: osx, osx_image: xcode9.1, compiler: clang, env: 'COMPILER=clang++ NO_INLINE=1 OPENDDS_BRANCH=latest-release'}
18-
- {os: linux, env: OPENDDS_BRANCH=master}
19-
- {os: linux, env: OPENDDS_BRANCH=latest-release}
16+
- {os: osx, osx_image: xcode9.1, compiler: clang, env: 'COMPILER=clang++ NO_INLINE=1 OPENDDS_BRANCH=master DDS_SECURITY=0'}
17+
- {os: osx, osx_image: xcode9.1, compiler: clang, env: 'COMPILER=clang++ NO_INLINE=1 OPENDDS_BRANCH=latest-release DDS_SECURITY=0'}
18+
- {os: linux, env: 'OPENDDS_BRANCH=master DDS_SECURITY=1'}
19+
- {os: linux, env: 'OPENDDS_BRANCH=latest-release DDS_SECURITY=1'}
20+
addons:
21+
apt:
22+
sources:
23+
- ubuntu-toolchain-r-test
24+
packages:
25+
- libxerces-c-dev
26+
- libssl-dev
2027
before_install:
2128
- nvm install $NODE_VERSION
2229
- nvm use $NODE_VERSION
@@ -28,7 +35,8 @@ branches:
2835
before_script:
2936
- export
3037
- cd OpenDDS
31-
- ./configure --no-tests --macros=c++11=1
38+
- if [ "$DDS_SECURITY" == 1 ]; then CONFIG_OPTIONS+=" --security"; fi
39+
- ./configure --no-tests --std=c++11 $CONFIG_OPTIONS
3240
- cd ..
3341
- npm install -g node-gyp
3442
script:
@@ -39,4 +47,5 @@ script:
3947
- $ACE_ROOT/bin/mwc.pl -type gnuace -exclude ACE_TAO,OpenDDS
4048
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TRAVIS_BUILD_DIR/tools/v8stubs
4149
- make
42-
- cd test; ./run_test.pl
50+
- if [ "$DDS_SECURITY" == 1 ]; then TEST_OPTIONS+=" --secure"; fi
51+
- cd test; ./run_test.pl $TEST_OPTIONS

0 commit comments

Comments
 (0)