Fix build with TLS, but not security (#4156)

Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit fae8f1e) # Conflicts: # test/blackbox/common/BlackboxTestsSecurity.cpp
eProsima · Dec 18, 2023 · 288ecd1 · 288ecd1
1 parent f7e55aa
commit 288ecd1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -49,6 +49,7 @@ extern void blackbox_security_init();
 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
@@ -37,8 +37,11 @@ using namespace eprosima::fastrtps::rtps;
 using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport;
 using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor;
 
+<<<<<<< HEAD
 static const char* certs_path = nullptr;
 
+=======
+>>>>>>> fae8f1e22 (Fix build with TLS, but not security (#4156))
 enum communication_type
 {
     TRANSPORT,