From ad7c7a68321d08e050c6c16df8d94124016cb913 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 18 Dec 2023 16:18:42 +0100 Subject: [PATCH] Fix build with TLS, but not security (#4156) Signed-off-by: Miguel Company (cherry picked from commit fae8f1e222410d637dc5ff585dfa425b495bba24) --- test/blackbox/common/BlackboxTests.cpp | 1 + test/blackbox/common/BlackboxTests.hpp | 2 +- test/blackbox/common/BlackboxTestsSecurity.cpp | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/blackbox/common/BlackboxTests.cpp b/test/blackbox/common/BlackboxTests.cpp index 0e83432997d..c051d1f969d 100644 --- a/test/blackbox/common/BlackboxTests.cpp +++ b/test/blackbox/common/BlackboxTests.cpp @@ -30,6 +30,7 @@ using namespace eprosima::fastrtps::rtps; //#define cout "Use Log instead!" +const char* certs_path = nullptr; uint16_t global_port = 0; bool enable_datasharing; bool use_pull_mode; diff --git a/test/blackbox/common/BlackboxTests.hpp b/test/blackbox/common/BlackboxTests.hpp index 0704263571f..5637b58ec41 100644 --- a/test/blackbox/common/BlackboxTests.hpp +++ b/test/blackbox/common/BlackboxTests.hpp @@ -46,13 +46,13 @@ #include #if HAVE_SECURITY -extern const char* certs_path; extern void blackbox_security_init(); #endif // if HAVE_SECURITY #if TLS_FOUND extern void tls_init(); #endif // if TLS_FOUND +extern const char* certs_path; extern uint16_t global_port; extern bool enable_datasharing; extern bool use_pull_mode; diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp index b38151bf415..2374d1067a0 100644 --- a/test/blackbox/common/BlackboxTestsSecurity.cpp +++ b/test/blackbox/common/BlackboxTestsSecurity.cpp @@ -37,8 +37,6 @@ using namespace eprosima::fastrtps::rtps; using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; -const char* certs_path = nullptr; - enum communication_type { TRANSPORT,