Skip to content

Remove exceptions for rmw_connext_cpp tests. #903

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 25, 2021
Merged

Remove exceptions for rmw_connext_cpp tests. #903

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36437bc
Remove exceptions for rmw_connext_cpp tests.
clalancette Mar 24, 2021
8a118c8
Remove AMENT_GTEST_ARGS.
clalancette Mar 25, 2021
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
24 changes: 0 additions & 24 deletions rcl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,6 @@ function(test_target_function)
AMENT_DEPENDENCIES ${rmw_implementation}
)

# TODO(asorbini): Remove these exceptions once ros2/rmw_connext is deprecated.
set(AMENT_GTEST_ARGS "")
if(rmw_implementation MATCHES "rmw_connext(.*)_cpp")
message(STATUS "Skipping test_timer${target_suffix} test.")
set(AMENT_GTEST_ARGS "SKIP_TEST")
endif()

rcl_add_custom_gtest(test_timer${target_suffix}
SRCS rcl/test_timer.cpp
ENV ${rmw_implementation_env_var}
Expand Down Expand Up @@ -121,16 +114,6 @@ function(test_target_function)
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
)

# TODO(asorbini): Remove these exceptions once ros2/rmw_connext is deprecated.
set(AMENT_GTEST_ARGS "")
if(rmw_implementation STREQUAL "rmw_connext_dynamic_cpp")
message(STATUS "Skipping test_graph${target_suffix} test.")
set(AMENT_GTEST_ARGS "SKIP_TEST")
elseif(rmw_implementation STREQUAL "rmw_connext_cpp")
message(STATUS "Increasing test_graph${target_suffix} test timeout.")
set(AMENT_GTEST_ARGS TIMEOUT 180)
endif()

rcl_add_custom_gtest(test_graph${target_suffix}
SRCS rcl/test_graph.cpp
ENV ${rmw_implementation_env_var}
Expand All @@ -141,13 +124,6 @@ function(test_target_function)
${AMENT_GTEST_ARGS}
)

# TODO(asorbini): Remove these exceptions once ros2/rmw_connext is deprecated.
set(AMENT_GTEST_ARGS "")
if(rmw_implementation MATCHES "rmw_connext(.*)_cpp")
message(STATUS "Increasing test_info_by_topic${target_suffix} test timeout.")
set(AMENT_GTEST_ARGS TIMEOUT 120)
endif()

rcl_add_custom_gtest(test_info_by_topic${target_suffix}
SRCS rcl/test_info_by_topic.cpp rcl/wait_for_entity_helpers.cpp
ENV ${rmw_implementation_env_var}
Expand Down