From ded998f365050679b55079d630d14c49a9ab1c78 Mon Sep 17 00:00:00 2001 From: Julien Enoch Date: Tue, 30 Jun 2026 17:51:14 +0200 Subject: [PATCH] Resolve conflicts Signed-off-by: Julien Enoch --- rclcpp/test/rclcpp/CMakeLists.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/rclcpp/test/rclcpp/CMakeLists.txt b/rclcpp/test/rclcpp/CMakeLists.txt index af9509b64c..e6aae10abd 100644 --- a/rclcpp/test/rclcpp/CMakeLists.txt +++ b/rclcpp/test/rclcpp/CMakeLists.txt @@ -57,16 +57,12 @@ ament_add_test_label(test_client mimick) if(TARGET test_client) target_link_libraries(test_client ${PROJECT_NAME} mimick ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS}) endif() -<<<<<<< HEAD -ament_add_gtest(test_clock test_clock.cpp) +ament_add_ros_isolated_gtest(test_clock test_clock.cpp) ament_add_test_label(test_clock mimick) if(TARGET test_clock) target_link_libraries(test_clock ${PROJECT_NAME} mimick ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS}) endif() -ament_add_gtest(test_clock_conditional test_clock_conditional.cpp) -======= ament_add_ros_isolated_gtest(test_clock_conditional test_clock_conditional.cpp) ->>>>>>> 87be5fb (Add tests isolation (#3081)) ament_add_test_label(test_clock_conditional mimick) if(TARGET test_clock_conditional) target_link_libraries(test_clock_conditional ${PROJECT_NAME} mimick ${rcl_interfaces_TARGETS} ${test_msgs_TARGETS}) @@ -538,18 +534,14 @@ if(TARGET test_executors_warmup) target_link_libraries(test_executors_warmup ${PROJECT_NAME} ${test_msgs_TARGETS}) endif() -<<<<<<< HEAD -ament_add_gtest(test_static_single_threaded_executor executors/test_static_single_threaded_executor.cpp +ament_add_ros_isolated_gtest(test_static_single_threaded_executor executors/test_static_single_threaded_executor.cpp APPEND_LIBRARY_DIRS "${append_library_dirs}") ament_add_test_label(test_static_single_threaded_executor mimick) if(TARGET test_static_single_threaded_executor) target_link_libraries(test_static_single_threaded_executor ${PROJECT_NAME} mimick ${test_msgs_TARGETS}) endif() -ament_add_gtest(test_multi_threaded_executor executors/test_multi_threaded_executor.cpp -======= ament_add_ros_isolated_gtest(test_multi_threaded_executor executors/test_multi_threaded_executor.cpp ->>>>>>> 87be5fb (Add tests isolation (#3081)) APPEND_LIBRARY_DIRS "${append_library_dirs}") if(TARGET test_multi_threaded_executor) target_link_libraries(test_multi_threaded_executor ${PROJECT_NAME})