Skip to content

Commit af0a591

Browse files
fbattocchia-ekumenfbattocchia-ekumen
authored
Merge branch 'main' into fbattocchia/increase-propagation-rate
2 parents 4f7b10c + 7629deb commit af0a591

5 files changed

Lines changed: 16 additions & 18 deletions

File tree

‎beluga_amcl/docs/ros2-reference.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Also available as a standalone `amcl_node` executable.
182182
: Mixture weight for the probability of getting short measurements used in the `beam` model.
183183
: Defaults to `0.05`.
184184

185-
`lambda_short _(`float`)_
185+
`lambda_short` _(`float`)_
186186
: Short readings' exponential distribution parameter used in the `beam` model.
187187
: Defaults to `0.1`.
188188

‎beluga_amcl/package.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
<depend condition="$ROS_VERSION == 2">rclcpp_lifecycle</depend>
3232

3333
<test_depend condition="$ROS_VERSION == 1">rostest</test_depend>
34-
<test_depend condition="$ROS_VERSION == 2">ament_cmake_gmock</test_depend>
35-
<test_depend condition="$ROS_VERSION == 2">ament_cmake_gtest</test_depend>
34+
<test_depend condition="$ROS_VERSION == 2">ament_cmake_ros</test_depend>
3635

3736
<export>
3837
<build_type condition="$ROS_VERSION == 1">catkin</build_type>

‎beluga_amcl/test/cmake/ament.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
find_package(ament_cmake_gmock REQUIRED)
15+
find_package(ament_cmake_ros REQUIRED)
1616

1717
file(COPY test_data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
1818

19-
ament_add_gmock(test_ros2_common test_ros2_common.cpp)
19+
ament_add_ros_isolated_gmock(test_ros2_common test_ros2_common.cpp)
2020
target_compile_options(test_ros2_common PRIVATE -Wno-deprecated-copy)
2121
target_link_libraries(test_ros2_common beluga_amcl_ros2_common)
2222
target_include_directories(test_ros2_common
2323
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_utils)
2424

25-
ament_add_gmock(test_amcl_node test_amcl_node.cpp)
25+
ament_add_ros_isolated_gmock(test_amcl_node test_amcl_node.cpp)
2626
target_compile_options(test_amcl_node PRIVATE -Wno-deprecated-copy)
2727
target_link_libraries(test_amcl_node amcl_node_component)
2828
target_include_directories(test_amcl_node
2929
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_utils)
3030

31-
ament_add_gmock(
31+
ament_add_ros_isolated_gmock(
3232
test_ndt_amcl_node
3333
test_ndt_amcl_node.cpp
3434
WORKING_DIRECTORY
@@ -38,7 +38,7 @@ target_include_directories(test_ndt_amcl_node
3838
target_compile_options(test_ndt_amcl_node PRIVATE -Wno-deprecated-copy)
3939
target_link_libraries(test_ndt_amcl_node ndt_amcl_node_component)
4040

41-
ament_add_gmock(
41+
ament_add_ros_isolated_gmock(
4242
test_ndt_amcl_3d_node
4343
test_ndt_amcl_3d_node.cpp
4444
WORKING_DIRECTORY

‎beluga_ros/package.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<depend>visualization_msgs</depend>
2929

3030
<test_depend condition="$ROS_VERSION == 1">rostest</test_depend>
31-
<test_depend condition="$ROS_VERSION == 2">ament_cmake_gmock</test_depend>
32-
<test_depend condition="$ROS_VERSION == 2">ament_cmake_gtest</test_depend>
31+
<test_depend condition="$ROS_VERSION == 2">ament_cmake_ros</test_depend>
3332

3433
<export>
3534
<build_type condition="$ROS_VERSION == 1">catkin</build_type>

‎beluga_ros/test/cmake/ament.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
find_package(ament_cmake_gmock REQUIRED)
15+
find_package(ament_cmake_ros REQUIRED)
1616
find_package(sensor_msgs REQUIRED)
1717

18-
ament_add_gmock(test_amcl test_amcl.cpp)
18+
ament_add_ros_isolated_gmock(test_amcl test_amcl.cpp)
1919
target_compile_options(test_amcl PRIVATE -Wno-deprecated-copy)
2020
target_link_libraries(test_amcl beluga_ros)
2121

22-
ament_add_gmock(test_messages test_messages.cpp)
22+
ament_add_ros_isolated_gmock(test_messages test_messages.cpp)
2323
target_compile_options(test_messages PRIVATE -Wno-deprecated-copy)
2424
target_link_libraries(test_messages beluga_ros)
2525

26-
ament_add_gmock(test_occupancy_grid test_occupancy_grid.cpp)
26+
ament_add_ros_isolated_gmock(test_occupancy_grid test_occupancy_grid.cpp)
2727
target_compile_options(test_occupancy_grid PRIVATE -Wno-deprecated-copy)
2828
target_link_libraries(test_occupancy_grid beluga_ros)
2929

30-
ament_add_gmock(test_tf2_sophus test_tf2_sophus.cpp)
30+
ament_add_ros_isolated_gmock(test_tf2_sophus test_tf2_sophus.cpp)
3131
target_compile_options(test_tf2_sophus PRIVATE -Wno-deprecated-copy)
3232
target_link_libraries(test_tf2_sophus beluga_ros)
3333

34-
ament_add_gmock(test_laser_scan test_laser_scan.cpp)
34+
ament_add_ros_isolated_gmock(test_laser_scan test_laser_scan.cpp)
3535
target_compile_options(test_laser_scan PRIVATE -Wno-deprecated-copy)
3636
target_link_libraries(test_laser_scan beluga_ros)
3737

38-
ament_add_gmock(test_particle_cloud test_particle_cloud.cpp)
38+
ament_add_ros_isolated_gmock(test_particle_cloud test_particle_cloud.cpp)
3939
target_compile_options(test_particle_cloud PRIVATE -Wno-deprecated-copy)
4040
target_link_libraries(test_particle_cloud beluga_ros)
4141

42-
ament_add_gmock(test_point_cloud test_point_cloud.cpp)
42+
ament_add_ros_isolated_gmock(test_point_cloud test_point_cloud.cpp)
4343
target_compile_options(test_point_cloud PRIVATE -Wno-deprecated-copy)
4444
target_link_libraries(test_point_cloud beluga_ros)

0 commit comments

Comments
 (0)