Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20340] Remove deprecated fastrtps tests #4270

Merged
merged 3 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/config/default_ci.meta
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ names:
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DFASTRTPS_API_TESTS=OFF"
- "-DINSTALL_EXAMPLES=ON"
- "-DINSTALL_TOOLS=ON"
- "-DINTERNAL_DEBUG=ON"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/config/nightly.meta
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ names:
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DFASTRTPS_API_TESTS=OFF"
- "-DINSTALL_EXAMPLES=ON"
- "-DINSTALL_TOOLS=ON"
- "-DINTERNAL_DEBUG=ON"
Expand Down
41 changes: 0 additions & 41 deletions test/blackbox/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

option(RTPS_API_TESTS "Enable tests using RTPS API" ON)
option(FASTRTPS_API_TESTS "Enable tests using FastRTPS API" OFF)
option(FASTDDS_PIM_API_TESTS "Enable tests using FastDDS API" ON)

if(WIN32)
Expand Down Expand Up @@ -183,46 +182,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builtin_transports_profile.xml
${CMAKE_CURRENT_BINARY_DIR}/builtin_transports_profile.xml)
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/datagrams" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

if(FASTRTPS_API_TESTS)
set(BLACKBOXTESTS_FASTRTPS_SOURCE
${BLACKBOXTESTS_SOURCE}
api/fastrtps_deprecated/ReqRepHelloWorldRequester.cpp
api/fastrtps_deprecated/ReqRepHelloWorldReplier.cpp
)

add_executable(BlackboxTests_FastRTPS ${BLACKBOXTESTS_FASTRTPS_SOURCE})
target_compile_definitions(BlackboxTests_FastRTPS PRIVATE
BOOST_ASIO_STANDALONE
ASIO_STANDALONE
$<$<NOT:$<BOOL:${IS_THIRDPARTY_BOOST_SUPPORTED}>>:FASTDDS_SHM_TRANSPORT_DISABLED> # Do not compile SHM Transport
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
$<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
$<$<BOOL:${WIN32}>:_ENABLE_ATOMIC_ALIGNMENT_FIX>
)
target_include_directories(BlackboxTests_FastRTPS PRIVATE
${Asio_INCLUDE_DIR}
api/fastrtps_deprecated)
target_link_libraries(BlackboxTests_FastRTPS
fastrtps
fastcdr
foonathan_memory
GTest::gtest
$<$<BOOL:${LibP11_FOUND}>:eProsima_p11> # $<TARGET_NAME_IF_EXISTS:eProsima_p11>
)

gtest_discover_tests(BlackboxTests_FastRTPS
PROPERTIES
ENVIRONMENT "CERTS_PATH=${PROJECT_SOURCE_DIR}/test/certs"
ENVIRONMENT "TOPIC_RANDOM_NUMBER=${TOPIC_RANDOM_NUMBER}"
ENVIRONMENT "W_UNICAST_PORT_RANDOM_NUMBER=${W_UNICAST_PORT_RANDOM_NUMBER}"
ENVIRONMENT "R_UNICAST_PORT_RANDOM_NUMBER=${R_UNICAST_PORT_RANDOM_NUMBER}"
ENVIRONMENT "MULTICAST_PORT_RANDOM_NUMBER=${MULTICAST_PORT_RANDOM_NUMBER}"
ENVIRONMENT $<IF:$<BOOL:${OPENSSL_CONF}>,OPENSSL_CONF=${OPENSSL_CONF},>
TEST_PREFIX "BlackboxTests_FastRTPS."
TEST_FILTER ${pkcs_filter} ${dns_filter}
NO_PRETTY_VALUES
)
endif(FASTRTPS_API_TESTS)

if(FASTDDS_PIM_API_TESTS)
set(BLACKBOXTESTS_FASTDDS_PIM_SOURCE
Expand Down
Loading
Loading