From 839ca56b200259a3b1079477a307389d5316fc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 15 Apr 2020 23:26:08 -0400 Subject: [PATCH] Set default values for RTI_OPENSSL_* to use in test_security. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 https://github.com/ros2/system_tests/pull/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 --- ros2_batch_job/osx_batch/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ros2_batch_job/osx_batch/__init__.py b/ros2_batch_job/osx_batch/__init__.py index 479516d5b..6bfd7a2f9 100644 --- a/ros2_batch_job/osx_batch/__init__.py +++ b/ros2_batch_job/osx_batch/__init__.py @@ -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 + \