From cd7f2d6c64c8a31ab0c7d909654267b3a15ab4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Sun, 17 Dec 2023 13:20:37 +0100 Subject: [PATCH] [CM] Increase tests timeout (#1224) (cherry picked from commit 82c82aed172ff9f3d9ef0e218d3d16bd63581840) # Conflicts: # controller_manager/CMakeLists.txt --- controller_manager/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt index a3adf25ff7..b6ee9437ca 100644 --- a/controller_manager/CMakeLists.txt +++ b/controller_manager/CMakeLists.txt @@ -127,10 +127,21 @@ if(BUILD_TESTING) test/test_controller_manager_srvs.cpp APPEND_ENV AMENT_PREFIX_PATH=${ament_index_build_path}_$ ) +<<<<<<< HEAD target_include_directories(test_controller_manager_srvs PRIVATE include) target_link_libraries(test_controller_manager_srvs ${PROJECT_NAME} test_controller test_chainable_controller) ament_target_dependencies( test_controller_manager_srvs +======= + target_link_libraries(test_controller_manager_srvs + controller_manager + test_controller + test_chainable_controller + ros2_control_test_assets::ros2_control_test_assets + ) + set_tests_properties(test_controller_manager_srvs PROPERTIES TIMEOUT 120) + ament_target_dependencies(test_controller_manager_srvs +>>>>>>> 82c82ae ([CM] Increase tests timeout (#1224)) controller_manager_msgs ros2_control_test_assets )