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.

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

Increase timeouts for connext for long tests #1253

Merged
merged 2 commits into from
Aug 3, 2020
Merged

Increase timeouts for connext for long tests #1253

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b54ca61
Increase timeouts for connext for long tests
brawner Jul 31, 2020
76b38df
Fix cmakelists
brawner Aug 1, 2020
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
26 changes: 23 additions & 3 deletions rclcpp/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@ rosidl_generate_interfaces(${PROJECT_NAME}_test_msgs
SKIP_INSTALL
)

ament_add_gtest(test_allocator_memory_strategy rclcpp/strategies/test_allocator_memory_strategy.cpp)
set(GTEST_TIMEOUT_ARGS "")
# TODO(brawner) remove when destroying Node for Connext is resolved. See:
# https://github.com/ros2/rclcpp/issues/1250
if(rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" OR rmw_implementation STREQUAL "rmw_connext_cpp")
message(STATUS "Increasing test_allocator_memory_strategy test timeout.")
set(GTEST_TIMEOUT_ARGS "TIMEOUT 180")
endif()
ament_add_gtest(
test_allocator_memory_strategy
rclcpp/strategies/test_allocator_memory_strategy.cpp
${GTEST_TIMEOUT_ARGS})
if(TARGET test_allocator_memory_strategy)
ament_target_dependencies(test_allocator_memory_strategy
"rcl"
Expand Down Expand Up @@ -470,8 +480,18 @@ if(TARGET test_interface_traits)
target_link_libraries(test_interface_traits ${PROJECT_NAME})
endif()

ament_add_gtest(test_executors rclcpp/executors/test_executors.cpp
APPEND_LIBRARY_DIRS "${append_library_dirs}")
set(GTEST_TIMEOUT_ARGS "")
# TODO(brawner) remove when destroying Node for Connext is resolved. See:
# https://github.com/ros2/rclcpp/issues/1250
if(rmw_implementation STREQUAL "rmw_connext_dynamic_cpp" OR rmw_implementation STREQUAL "rmw_connext_cpp")
message(STATUS "Increasing test_allocator_memory_strategy test timeout.")
set(GTEST_TIMEOUT_ARGS "TIMEOUT 180")
endif()
ament_add_gtest(
test_executors
rclcpp/executors/test_executors.cpp
APPEND_LIBRARY_DIRS "${append_library_dirs}"
${GTEST_TIMEOUT_ARGS})
if(TARGET test_executors)
ament_target_dependencies(test_executors
"rcl")
Expand Down