Skip to content

Commit

Permalink
Set default values for RTI_OPENSSL_* to use in test_security.
Browse files Browse the repository at this point in the history
Connext 5.3.1 requires an older version of openssl which is no longer
available from the system macOS installation.
Connext supplies a compatible openssl distribution and
ros2/system_tests#409 sets up a convention for
using it only for the security tests which require it when running with
Connext.

Signed-off-by: Steven! Ragnarök <steven@nuclearsandwich.com>
  • Loading branch information
nuclearsandwich authored and mikaelarguedas committed Jun 16, 2020
1 parent 4babbe7 commit 839ca56
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions ros2_batch_job/osx_batch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@ def pre(self):
warn('OSPL_HOME not set; using default value')
os.environ['OSPL_HOME'] = os.path.join(
os.environ['HOME'], 'opensplice', 'HDE', 'x86_64.darwin10_clang')
# TODO(nuclearsandwich) remove this when Connext supports system openssl
# https://github.com/ros2/system_tests/pull/409
if 'RTI_OPENSSL_BIN' not in os.environ:
warn('RTI_OPENSSL_BIN unset; using default value')
os.environ['RTI_OPENSSL_BIN'] = os.path.join(
'/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n',
'x64Darwin17clang9.0', 'release', 'bin')
if 'RTI_OPENSSL_LIBS' not in os.environ:
warn('RTI_OPENSSL_LIBS unset; using default value')
os.environ['RTI_OPENSSL_LIBS'] = os.path.join(
'/Applications', 'rti_connext_dds-5.3.1', 'openssl-1.0.2n',
'x64Darwin17clang9.0', 'release', 'lib')
# TODO(wjwwood): remove this when qt5 is linked on macOS by default
# See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367
os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + \
Expand Down

0 comments on commit 839ca56

Please sign in to comment.