From 5d25332c2ec60b640c3935f2838d8085b4a4b748 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 27 May 2020 05:20:17 -0700 Subject: [PATCH 1/2] Disable Connext security tests on Windows Connext needs a different version of OpenSSL (1.0.2n) than the system version. Disabling these tests until we can figure out how to run them on CI. Signed-off-by: Jacob Perron --- test_security/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test_security/CMakeLists.txt b/test_security/CMakeLists.txt index 768e8882..b9159799 100644 --- a/test_security/CMakeLists.txt +++ b/test_security/CMakeLists.txt @@ -269,9 +269,10 @@ if(BUILD_TESTING) endif() # TODO(mikaelarguedas) only Connext and FastRTPS support DDS-Security for now + # TODO(jacobperron) Disable Connext on Windows until we fix issue with CI if( - rmw_implementation STREQUAL "rmw_connext_cpp" OR - rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" OR + rmw_implementation STREQUAL "rmw_connext_cpp" AND NOT WIN32 OR + rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" AND NOT WIN32 OR rmw_implementation STREQUAL "rmw_fastrtps_cpp" OR rmw_implementation STREQUAL "rmw_fastrtps_dynamic_cpp" ) From cdd83f8e32266c1046922f268ad10f6ca89c5a9c Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Fri, 29 May 2020 17:26:02 -0700 Subject: [PATCH 2/2] Use parentheses Signed-off-by: Jacob Perron --- test_security/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_security/CMakeLists.txt b/test_security/CMakeLists.txt index b9159799..a3c42ce8 100644 --- a/test_security/CMakeLists.txt +++ b/test_security/CMakeLists.txt @@ -271,8 +271,8 @@ if(BUILD_TESTING) # TODO(mikaelarguedas) only Connext and FastRTPS support DDS-Security for now # TODO(jacobperron) Disable Connext on Windows until we fix issue with CI if( - rmw_implementation STREQUAL "rmw_connext_cpp" AND NOT WIN32 OR - rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" AND NOT WIN32 OR + (rmw_implementation STREQUAL "rmw_connext_cpp" AND NOT WIN32) OR + (rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" AND NOT WIN32) OR rmw_implementation STREQUAL "rmw_fastrtps_cpp" OR rmw_implementation STREQUAL "rmw_fastrtps_dynamic_cpp" )