restrict test_msgs to test_dependency (#2827)

Signed-off-by: Alberto Soragna <[email protected]>
ros-navigation · Feb 20, 2022 · 0a961df · 0a961df
1 parent d916d52
commit 0a961df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/nav2_behavior_tree/package.xml b/nav2_behavior_tree/package.xml
@@ -51,6 +51,7 @@
   <test_depend>ament_lint_common</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>
+  <test_depend>test_msgs</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

diff --git a/nav2_behavior_tree/test/plugins/action/CMakeLists.txt b/nav2_behavior_tree/test/plugins/action/CMakeLists.txt
@@ -1,5 +1,7 @@
+find_package(test_msgs REQUIRED)
+
 ament_add_gtest(test_bt_action_node test_bt_action_node.cpp)
-ament_target_dependencies(test_bt_action_node ${dependencies})
+ament_target_dependencies(test_bt_action_node ${dependencies} test_msgs)
 
 ament_add_gtest(test_action_spin_action test_spin_action.cpp)
 target_link_libraries(test_action_spin_action nav2_spin_action_bt_node)

diff --git a/nav2_util/CMakeLists.txt b/nav2_util/CMakeLists.txt
@@ -12,7 +12,6 @@ find_package(nav_msgs REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(lifecycle_msgs REQUIRED)
 find_package(rclcpp_action REQUIRED)
-find_package(test_msgs REQUIRED)
 find_package(rclcpp_lifecycle REQUIRED)
 find_package(tf2_geometry_msgs REQUIRED)
 find_package(bondcpp REQUIRED)

diff --git a/nav2_util/package.xml b/nav2_util/package.xml
@@ -24,7 +24,6 @@
   <depend>bondcpp</depend>
   <depend>bond</depend>
   <depend>rclcpp_action</depend>
-  <depend>test_msgs</depend>
   <depend>rclcpp_lifecycle</depend>
   <depend>launch</depend>
   <depend>launch_testing_ament_cmake</depend>
@@ -38,6 +37,7 @@
   <test_depend>launch</test_depend>
   <test_depend>launch_testing_ament_cmake</test_depend>
   <test_depend>std_srvs</test_depend>
+  <test_depend>test_msgs</test_depend>
   <test_depend>action_msgs</test_depend>
   <test_depend>launch_testing_ros</test_depend>
   <test_depend>ament_cmake_pytest</test_depend>

diff --git a/nav2_util/test/CMakeLists.txt b/nav2_util/test/CMakeLists.txt
@@ -3,7 +3,8 @@ ament_add_gtest(test_execution_timer test_execution_timer.cpp)
 ament_add_gtest(test_node_utils test_node_utils.cpp)
 target_link_libraries(test_node_utils ${library_name})
 
-find_package(std_srvs)
+find_package(std_srvs REQUIRED)
+find_package(test_msgs REQUIRED)
 
 ament_add_gtest(test_service_client test_service_client.cpp)
 ament_target_dependencies(test_service_client std_srvs)