Skip to content

Commit dc72275

Browse files
elianalfEduPonz
authored andcommitted
Remove deprecated fastrtps tests (#4270)
* Refs #20340: Remove deprecated fastrtps tests Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Refs #20340: Restore XML parser tests Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20340: Update version.md file Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs 20340: Remove no longer supported FASTRTPS_API_TESTS Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 238fc70 commit dc72275

13 files changed

Lines changed: 2 additions & 5600 deletions

.github/workflows/config/ci.meta

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ names:
88
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
99
- "-DFASTDDS_PIM_API_TESTS=ON"
1010
- "-DFASTDDS_STATISTICS=ON"
11-
- "-DFASTRTPS_API_TESTS=OFF"
1211
- "-DINSTALL_EXAMPLES=ON"
1312
- "-DINSTALL_TOOLS=ON"
1413
- "-DINTERNAL_DEBUG=ON"

test/blackbox/CMakeLists.txt

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
option(RTPS_API_TESTS "Enable tests using RTPS API" ON)
16-
option(FASTRTPS_API_TESTS "Enable tests using FastRTPS API" OFF)
1716
option(FASTDDS_PIM_API_TESTS "Enable tests using FastDDS API" ON)
1817

1918
if(WIN32)
@@ -190,46 +189,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/auth_handshake_props_profile.xml
190189
${CMAKE_CURRENT_BINARY_DIR}/auth_handshake_props_profile.xml COPYONLY)
191190
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/datagrams" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
192191

193-
if(FASTRTPS_API_TESTS)
194-
set(BLACKBOXTESTS_FASTRTPS_SOURCE
195-
${BLACKBOXTESTS_SOURCE}
196-
api/fastrtps_deprecated/ReqRepHelloWorldRequester.cpp
197-
api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp
198-
)
199-
200-
add_executable(BlackboxTests_FastRTPS ${BLACKBOXTESTS_FASTRTPS_SOURCE})
201-
target_compile_definitions(BlackboxTests_FastRTPS PRIVATE
202-
BOOST_ASIO_STANDALONE
203-
ASIO_STANDALONE
204-
$<$<NOT:$<BOOL:${IS_THIRDPARTY_BOOST_SUPPORTED}>>:FASTDDS_SHM_TRANSPORT_DISABLED> # Do not compile SHM Transport
205-
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
206-
$<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
207-
$<$<BOOL:${WIN32}>:_ENABLE_ATOMIC_ALIGNMENT_FIX>
208-
)
209-
target_include_directories(BlackboxTests_FastRTPS PRIVATE
210-
${Asio_INCLUDE_DIR}
211-
api/fastrtps_deprecated)
212-
target_link_libraries(BlackboxTests_FastRTPS
213-
fastrtps
214-
fastcdr
215-
foonathan_memory
216-
GTest::gtest
217-
$<$<BOOL:${LibP11_FOUND}>:eProsima_p11> # $<TARGET_NAME_IF_EXISTS:eProsima_p11>
218-
)
219-
220-
gtest_discover_tests(BlackboxTests_FastRTPS
221-
PROPERTIES
222-
ENVIRONMENT "CERTS_PATH=${PROJECT_SOURCE_DIR}/test/certs"
223-
ENVIRONMENT "TOPIC_RANDOM_NUMBER=${TOPIC_RANDOM_NUMBER}"
224-
ENVIRONMENT "W_UNICAST_PORT_RANDOM_NUMBER=${W_UNICAST_PORT_RANDOM_NUMBER}"
225-
ENVIRONMENT "R_UNICAST_PORT_RANDOM_NUMBER=${R_UNICAST_PORT_RANDOM_NUMBER}"
226-
ENVIRONMENT "MULTICAST_PORT_RANDOM_NUMBER=${MULTICAST_PORT_RANDOM_NUMBER}"
227-
ENVIRONMENT $<IF:$<BOOL:${OPENSSL_CONF}>,OPENSSL_CONF=${OPENSSL_CONF},>
228-
TEST_PREFIX "BlackboxTests_FastRTPS."
229-
TEST_FILTER ${pkcs_filter} ${dns_filter}
230-
NO_PRETTY_VALUES
231-
)
232-
endif(FASTRTPS_API_TESTS)
233192

234193
if(FASTDDS_PIM_API_TESTS)
235194
set(BLACKBOXTESTS_FASTDDS_PIM_SOURCE

0 commit comments

Comments
 (0)