From b9645115d32b0d14e8be5e0af6299b9873603046 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 27 Sep 2024 11:48:10 +0200 Subject: [PATCH 1/4] Initial Signed-off-by: Pablo Garrido --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bff6d51..324d6d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ project(microxrcedds VERSION "2.4.3") set(_client_tag v2.4.3) set(_client_version 2.4.3) -set(_agent_tag v2.4.3) +set(_agent_tag feature/fastdds3) set(_gen_tag v2.0.2) ############################################################################### @@ -75,7 +75,6 @@ endif() if(UXRCE_BUILD_CI_TESTS) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND _test_command COMMAND ${CMAKE_CTEST_COMMAND} -VV -T MemCheck) - list(APPEND _test_command COMMAND ${CMAKE_CTEST_COMMAND} -VV -T Coverage) endif() endif() From b28c698399788dbe517f301099090194e53e7185 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 27 Sep 2024 12:41:08 +0200 Subject: [PATCH 2/4] Fix tests --- test/test/client_agent/ClientAgentCan.hpp | 5 +- .../client_agent/ClientAgentInteraction.cpp | 82 +------------------ .../client_agent/ClientAgentInteraction.hpp | 9 +- test/test/client_agent/ClientAgentSerial.hpp | 23 +++--- test/test/common/EntitiesInfo.hpp.in | 4 - test/test/discovery/DiscoveryIntegration.cpp | 5 +- .../PublisherSubscriberCan.cpp | 3 - .../PublisherSubscriberInteraction.cpp | 5 +- .../PublisherSubscriberSerial.cpp | 3 - 9 files changed, 17 insertions(+), 122 deletions(-) diff --git a/test/test/client_agent/ClientAgentCan.hpp b/test/test/client_agent/ClientAgentCan.hpp index be483de..fd909df 100644 --- a/test/test/client_agent/ClientAgentCan.hpp +++ b/test/test/client_agent/ClientAgentCan.hpp @@ -22,9 +22,6 @@ class AgentCan case MiddlewareKind::FASTDDS: middleware_ = eprosima::uxr::Middleware::Kind::FASTDDS; break; - case MiddlewareKind::FASTRTPS: - middleware_ = eprosima::uxr::Middleware::Kind::FASTRTPS; - break; case MiddlewareKind::CED: middleware_ = eprosima::uxr::Middleware::Kind::CED; break; @@ -34,7 +31,7 @@ class AgentCan ~AgentCan() {} - bool is_interface_up(const char * interface) + bool is_interface_up(const char * interface) { struct ifreq ifr; int sock = socket(PF_CAN, SOCK_RAW, CAN_RAW); diff --git a/test/test/client_agent/ClientAgentInteraction.cpp b/test/test/client_agent/ClientAgentInteraction.cpp index 5250212..7b51a09 100644 --- a/test/test/client_agent/ClientAgentInteraction.cpp +++ b/test/test/client_agent/ClientAgentInteraction.cpp @@ -26,11 +26,6 @@ TEST_P(ClientAgentInteraction, NewEntitiesCreationXMLBestEffort) ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x01, UXR_STATUS_OK, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x01, UXR_STATUS_OK, 0)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x01, UXR_STATUS_OK, 0)); @@ -48,11 +43,6 @@ TEST_P(ClientAgentInteraction, NewEntitiesCreationXMLReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); @@ -70,11 +60,6 @@ TEST_P(ClientAgentInteraction, NewEntitiesCreationBINBestEffort) ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x01, UXR_STATUS_OK, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - // Not implemented - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x01, UXR_STATUS_OK, 0)); @@ -92,11 +77,6 @@ TEST_P(ClientAgentInteraction, NewEntitiesCreationBINReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - // Not implemented - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, 0)); @@ -114,11 +94,6 @@ TEST_P(ClientAgentInteraction, NewEntitiesCreationREFBestEffort) ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x01, UXR_STATUS_OK, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x01, UXR_STATUS_OK, 0)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x01, UXR_STATUS_OK, 0)); @@ -136,11 +111,6 @@ TEST_P(ClientAgentInteraction, NewEntitiesCreationREFReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK, 0)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK, 0)); @@ -159,12 +129,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReuseXMLXMLReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REUSE)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REUSE)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); @@ -184,11 +148,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReuseBINBINReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REUSE)); break; } - case MiddlewareKind::FASTRTPS: - { - // Not implemented - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, 0)); @@ -216,12 +175,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReuseREFREFReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REUSE)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK, 0)); - ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REUSE)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_ref(1, 0x80, UXR_STATUS_OK, 0)); @@ -241,12 +194,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReplaceXMLXMLReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, UXR_REPLACE)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, UXR_REPLACE)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); @@ -266,11 +213,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReplaceBINBINReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, UXR_REPLACE)); break; } - case MiddlewareKind::FASTRTPS: - { - // Not implemented - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, 0)); @@ -290,12 +232,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationNoReplaceXMLXMLReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_ERR_ALREADY_EXISTS, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_ERR_ALREADY_EXISTS, 0)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); @@ -315,11 +251,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationNoReplaceBINBINReliable) ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_ERR_ALREADY_EXISTS, 0)); break; } - case MiddlewareKind::FASTRTPS: - { - // Not implemented - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, 0)); @@ -339,12 +270,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReplaceReuseXMLXMLReliabl ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REPLACE | UXR_REUSE)); break; } - case MiddlewareKind::FASTRTPS: - { - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); - ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REPLACE | UXR_REUSE)); - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); @@ -364,11 +289,6 @@ TEST_P(ClientAgentInteraction, ExistantEntitiesCreationReplaceReuseBINBINReliabl ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK_MATCHED, UXR_REPLACE | UXR_REUSE)); break; } - case MiddlewareKind::FASTRTPS: - { - // Not implemented - break; - } case MiddlewareKind::CED: { ASSERT_NO_FATAL_FAILURE(client_.create_entities_bin(1, 0x80, UXR_STATUS_OK, 0)); @@ -395,7 +315,7 @@ GTEST_INSTANTIATE_TEST_MACRO( ClientAgentInteraction, ::testing::Combine( ::testing::Values(Transport::UDP_IPV4_TRANSPORT, Transport::TCP_IPV4_TRANSPORT, Transport::UDP_IPV6_TRANSPORT, Transport::TCP_IPV6_TRANSPORT), - ::testing::Values(MiddlewareKind::FASTDDS, MiddlewareKind::FASTRTPS, MiddlewareKind::CED))); + ::testing::Values(MiddlewareKind::FASTDDS, MiddlewareKind::CED))); GTEST_INSTANTIATE_TEST_MACRO( CustomTransports, diff --git a/test/test/client_agent/ClientAgentInteraction.hpp b/test/test/client_agent/ClientAgentInteraction.hpp index 9b241c0..58c9fe3 100644 --- a/test/test/client_agent/ClientAgentInteraction.hpp +++ b/test/test/client_agent/ClientAgentInteraction.hpp @@ -30,9 +30,6 @@ class Agent case MiddlewareKind::FASTDDS: middleware_ = eprosima::uxr::Middleware::Kind::FASTDDS; break; - case MiddlewareKind::FASTRTPS: - middleware_ = eprosima::uxr::Middleware::Kind::FASTRTPS; - break; case MiddlewareKind::CED: middleware_ = eprosima::uxr::Middleware::Kind::CED; break; @@ -84,7 +81,7 @@ class Agent { // Do nothing } - + agent_custom_.reset(new eprosima::uxr::CustomAgent( "custom_agent", @@ -123,7 +120,7 @@ class Agent ASSERT_TRUE(agent_custom_->start()); break; } - + } } @@ -155,7 +152,7 @@ class Agent case Transport::CUSTOM_WITH_FRAMING: { ASSERT_TRUE(agent_custom_->stop()); - break; + break; } } } diff --git a/test/test/client_agent/ClientAgentSerial.hpp b/test/test/client_agent/ClientAgentSerial.hpp index fa4f51c..7cc1059 100644 --- a/test/test/client_agent/ClientAgentSerial.hpp +++ b/test/test/client_agent/ClientAgentSerial.hpp @@ -23,9 +23,6 @@ class AgentSerial case MiddlewareKind::FASTDDS: middleware_ = eprosima::uxr::Middleware::Kind::FASTDDS; break; - case MiddlewareKind::FASTRTPS: - middleware_ = eprosima::uxr::Middleware::Kind::FASTRTPS; - break; case MiddlewareKind::CED: middleware_ = eprosima::uxr::Middleware::Kind::CED; break; @@ -50,13 +47,13 @@ class AgentSerial case Transport::MULTISERIAL_TRANSPORT: { struct termios attr = ClientSerial::init_termios(baudrate); - + std::vector devs; for (size_t i = 0; i < client_number; i++) { devs.push_back(port_name); } - + agent_multiserial_.reset(new eprosima::uxr::MultiTermiosAgent(devs, O_RDWR | O_NOCTTY, attr, 0, middleware_)); ASSERT_TRUE(agent_multiserial_->start()); break; @@ -118,7 +115,7 @@ class ClientAgentSerial : public ::testing::TestWithParam(GetParam())) , clients_multiserial_{} , agent_(transport_, (MiddlewareKind) std::get<1>(GetParam())) - { + { for (size_t i = 0; i < agent_.client_number; i++) { ClientSerial auxcli(0.0f, 8); @@ -131,7 +128,7 @@ class ClientAgentSerial : public ::testing::TestWithParam clients_multiserial_; ClientSerial client_serial_; }; diff --git a/test/test/common/EntitiesInfo.hpp.in b/test/test/common/EntitiesInfo.hpp.in index 5d0c3db..d63b245 100644 --- a/test/test/common/EntitiesInfo.hpp.in +++ b/test/test/common/EntitiesInfo.hpp.in @@ -70,7 +70,6 @@ static constexpr const char* fast_datareader_xml = enum class MiddlewareKind : uint8_t { FASTDDS, - FASTRTPS, CED }; @@ -108,9 +107,6 @@ struct EntitiesInfo static constexpr const char* datareader_xml = fast_datareader_xml; }; -template<> -struct EntitiesInfo : public EntitiesInfo {}; - template<> struct EntitiesInfo { diff --git a/test/test/discovery/DiscoveryIntegration.cpp b/test/test/discovery/DiscoveryIntegration.cpp index bfe35aa..8a3fb55 100644 --- a/test/test/discovery/DiscoveryIntegration.cpp +++ b/test/test/discovery/DiscoveryIntegration.cpp @@ -34,9 +34,6 @@ class DiscoveryIntegration : public ::testing::TestWithParam(id_, 0x80, UXR_STATUS_OK, 0)); break; - case MiddlewareKind::FASTRTPS: - ASSERT_NO_FATAL_FAILURE(ClientCan::create_entities_xml(id_, 0x80, UXR_STATUS_OK, 0)); - break; case MiddlewareKind::CED: ASSERT_NO_FATAL_FAILURE(ClientCan::create_entities_xml(id_, 0x80, UXR_STATUS_OK, 0)); break; diff --git a/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp b/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp index fae6fcb..e56b87f 100644 --- a/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp +++ b/test/test/publisher_subscriber/PublisherSubscriberInteraction.cpp @@ -54,9 +54,6 @@ class PubSub : public Client case MiddlewareKind::FASTDDS: ASSERT_NO_FATAL_FAILURE(Client::create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); break; - case MiddlewareKind::FASTRTPS: - ASSERT_NO_FATAL_FAILURE(Client::create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); - break; case MiddlewareKind::CED: ASSERT_NO_FATAL_FAILURE(Client::create_entities_xml(1, 0x80, UXR_STATUS_OK, 0)); break; @@ -222,7 +219,7 @@ GTEST_INSTANTIATE_TEST_MACRO( PublisherSubscriberNoLost, ::testing::Combine( ::testing::Values(Transport::UDP_IPV4_TRANSPORT, Transport::UDP_IPV6_TRANSPORT, Transport::TCP_IPV4_TRANSPORT, Transport::TCP_IPV6_TRANSPORT), - ::testing::Values(MiddlewareKind::FASTDDS, MiddlewareKind::FASTRTPS, MiddlewareKind::CED), + ::testing::Values(MiddlewareKind::FASTDDS, MiddlewareKind::CED), ::testing::Values(0.0f), ::testing::Values(XRCECreationMode::XRCE_XML_CREATION))); diff --git a/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp b/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp index b015e59..c7c7bdc 100644 --- a/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp +++ b/test/test/publisher_subscriber/PublisherSubscriberSerial.cpp @@ -44,9 +44,6 @@ class PubSubSerial : public ClientSerial case MiddlewareKind::FASTDDS: ASSERT_NO_FATAL_FAILURE(ClientSerial::create_entities_xml(id_, 0x80, UXR_STATUS_OK, 0)); break; - case MiddlewareKind::FASTRTPS: - ASSERT_NO_FATAL_FAILURE(ClientSerial::create_entities_xml(id_, 0x80, UXR_STATUS_OK, 0)); - break; case MiddlewareKind::CED: ASSERT_NO_FATAL_FAILURE(ClientSerial::create_entities_xml(id_, 0x80, UXR_STATUS_OK, 0)); break; From e8a90d5eb3b3afef59edf03fafde46132271ff0b Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 27 Sep 2024 12:58:43 +0200 Subject: [PATCH 3/4] Fix profiles --- test/test/client_agent/CMakeLists.txt | 4 ++-- ...STRTPS_PROFILES.xml.in => DEFAULT_FASTDDS_PROFILES.xml.in} | 0 test/test/discovery/CMakeLists.txt | 4 ++-- ...STRTPS_PROFILES.xml.in => DEFAULT_FASTDDS_PROFILES.xml.in} | 0 test/test/publisher_subscriber/CMakeLists.txt | 4 ++-- ...STRTPS_PROFILES.xml.in => DEFAULT_FASTDDS_PROFILES.xml.in} | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename test/test/client_agent/{DEFAULT_FASTRTPS_PROFILES.xml.in => DEFAULT_FASTDDS_PROFILES.xml.in} (100%) rename test/test/discovery/{DEFAULT_FASTRTPS_PROFILES.xml.in => DEFAULT_FASTDDS_PROFILES.xml.in} (100%) rename test/test/publisher_subscriber/{DEFAULT_FASTRTPS_PROFILES.xml.in => DEFAULT_FASTDDS_PROFILES.xml.in} (100%) diff --git a/test/test/client_agent/CMakeLists.txt b/test/test/client_agent/CMakeLists.txt index 7ae1f8d..7d124ce 100644 --- a/test/test/client_agent/CMakeLists.txt +++ b/test/test/client_agent/CMakeLists.txt @@ -14,8 +14,8 @@ cmake_host_system_information(RESULT HOSTNAME_SUFFIX QUERY HOSTNAME) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTRTPS_PROFILES.xml.in - ${CMAKE_CURRENT_BINARY_DIR}/DEFAULT_FASTRTPS_PROFILES.xml +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTDDS_PROFILES.xml.in + ${CMAKE_CURRENT_BINARY_DIR}/DEFAULT_FASTDDS_PROFILES.xml @ONLY ) diff --git a/test/test/client_agent/DEFAULT_FASTRTPS_PROFILES.xml.in b/test/test/client_agent/DEFAULT_FASTDDS_PROFILES.xml.in similarity index 100% rename from test/test/client_agent/DEFAULT_FASTRTPS_PROFILES.xml.in rename to test/test/client_agent/DEFAULT_FASTDDS_PROFILES.xml.in diff --git a/test/test/discovery/CMakeLists.txt b/test/test/discovery/CMakeLists.txt index 8bb86be..a52d986 100644 --- a/test/test/discovery/CMakeLists.txt +++ b/test/test/discovery/CMakeLists.txt @@ -14,8 +14,8 @@ cmake_host_system_information(RESULT HOSTNAME_SUFFIX QUERY HOSTNAME) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTRTPS_PROFILES.xml.in - ${CMAKE_CURRENT_BINARY_DIR}/DEFAULT_FASTRTPS_PROFILES.xml +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTDDS_PROFILES.xml.in + ${CMAKE_CURRENT_BINARY_DIR}/DEFAULT_FASTDDS_PROFILES.xml @ONLY ) diff --git a/test/test/discovery/DEFAULT_FASTRTPS_PROFILES.xml.in b/test/test/discovery/DEFAULT_FASTDDS_PROFILES.xml.in similarity index 100% rename from test/test/discovery/DEFAULT_FASTRTPS_PROFILES.xml.in rename to test/test/discovery/DEFAULT_FASTDDS_PROFILES.xml.in diff --git a/test/test/publisher_subscriber/CMakeLists.txt b/test/test/publisher_subscriber/CMakeLists.txt index 28e4748..057b99d 100644 --- a/test/test/publisher_subscriber/CMakeLists.txt +++ b/test/test/publisher_subscriber/CMakeLists.txt @@ -14,8 +14,8 @@ cmake_host_system_information(RESULT HOSTNAME_SUFFIX QUERY HOSTNAME) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTRTPS_PROFILES.xml.in - ${CMAKE_CURRENT_BINARY_DIR}/DEFAULT_FASTRTPS_PROFILES.xml +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTDDS_PROFILES.xml.in + ${CMAKE_CURRENT_BINARY_DIR}/DEFAULT_FASTDDS_PROFILES.xml @ONLY ) diff --git a/test/test/publisher_subscriber/DEFAULT_FASTRTPS_PROFILES.xml.in b/test/test/publisher_subscriber/DEFAULT_FASTDDS_PROFILES.xml.in similarity index 100% rename from test/test/publisher_subscriber/DEFAULT_FASTRTPS_PROFILES.xml.in rename to test/test/publisher_subscriber/DEFAULT_FASTDDS_PROFILES.xml.in From c919c3b87cc3cc27e99d944787460c8a0d2b8760 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 14 Oct 2024 10:40:41 +0200 Subject: [PATCH 4/4] Use final branches --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 324d6d6..3ba7218 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,9 @@ endif() project(microxrcedds VERSION "2.4.3") -set(_client_tag v2.4.3) -set(_client_version 2.4.3) -set(_agent_tag feature/fastdds3) +set(_client_tag v3.0.0) +set(_client_version 3.0.0) +set(_agent_tag v3.0.0) set(_gen_tag v2.0.2) ###############################################################################