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

Jump to bottom

Parameterize test executors for all executor types #1222

Merged
merged 6 commits into from
Jul 15, 2020
Merged

Parameterize test executors for all executor types #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5ae87c
Relocate test_executor to executors directory
brawner Jul 9, 2020
abb5b64
Parametrize test_executors for all executor types
brawner Jul 9, 2020
1c33046
PR Fixup
brawner Jul 13, 2020
e43a509
More fixup
brawner Jul 14, 2020
ed8b510
Fixup
brawner Jul 14, 2020
afb2ed0
Adding issue for tracking
brawner Jul 15, 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
16 changes: 8 additions & 8 deletions rclcpp/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,6 @@ if(TARGET test_duration)
target_link_libraries(test_duration ${PROJECT_NAME})
endif()

ament_add_gtest(test_executor rclcpp/test_executor.cpp
APPEND_LIBRARY_DIRS "${append_library_dirs}")
if(TARGET test_executor)
ament_target_dependencies(test_executor
"rcl")
target_link_libraries(test_executor ${PROJECT_NAME})
endif()

ament_add_gtest(test_logger rclcpp/test_logger.cpp)
target_link_libraries(test_logger ${PROJECT_NAME})

Expand Down Expand Up @@ -458,6 +450,14 @@ 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}")
if(TARGET test_executors)
ament_target_dependencies(test_executors
"rcl")
target_link_libraries(test_executors ${PROJECT_NAME})
endif()

ament_add_gtest(test_static_single_threaded_executor rclcpp/executors/test_static_single_threaded_executor.cpp
APPEND_LIBRARY_DIRS "${append_library_dirs}")
if(TARGET test_static_single_threaded_executor)
Expand Down
Loading