Minor cleanup and fixes (#336)

* Fix environment for colcon builds (no appends necessary) * Fix warning in visual_test_fixture.cpp and add -Werror option in CMakeLists.txt * Fix Qt moc warning for virtual signal
ros2 · Jul 25, 2018 · 8ae0604 · 8ae0604
1 parent 09905a3
commit 8ae0604
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 46 deletions.
diff --git a/rviz_common/include/rviz_common/frame_manager_iface.hpp b/rviz_common/include/rviz_common/frame_manager_iface.hpp
@@ -265,8 +265,7 @@ class RVIZ_COMMON_PUBLIC FrameManagerIface : public QObject
 #endif
 
 Q_SIGNALS:
-  /// Emitted whenever the fixed frame changes.
-  virtual void fixedFrameChanged() = 0;
+  void fixedFrameChanged();
 };
 
 }  // namespace rviz_common

diff --git a/rviz_common/src/rviz_common/frame_manager.hpp b/rviz_common/src/rviz_common/frame_manager.hpp
@@ -226,10 +226,6 @@ class FrameManager : public FrameManagerIface
     tf::FilterFailureReason reason) override;
 #endif
 
-Q_SIGNALS:
-  /// Emitted whenever the fixed frame changes.
-  void fixedFrameChanged() override;
-
 private:
   bool adjustTime(const std::string & frame, rclcpp::Time & time);
 

diff --git a/rviz_default_plugins/CMakeLists.txt b/rviz_default_plugins/CMakeLists.txt
@@ -290,8 +290,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/view_controllers/fps/fps_view_controller_test.cpp
       test/rviz_default_plugins/view_controllers/view_controller_test_fixture.hpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET fps_view_controller_test)
       target_include_directories(fps_view_controller_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(fps_view_controller_test ${TEST_LINK_LIBRARIES})
@@ -300,17 +299,15 @@ if(BUILD_TESTING)
     ament_add_gmock(frame_info_test
       test/rviz_default_plugins/displays/tf/frame_info_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET frame_info_test)
       target_include_directories(frame_info_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(frame_info_test ${TEST_LINK_LIBRARIES})
     endif()
 
     ament_add_gmock(grid_cells_display_test
       test/rviz_default_plugins/displays/grid_cells/grid_cells_display_test.cpp
-      test/rviz_default_plugins/displays/display_test_fixture.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/displays/display_test_fixture.cpp)
     if(TARGET grid_cells_display_test)
       target_include_directories(grid_cells_display_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(grid_cells_display_test ${TEST_LINK_LIBRARIES})
@@ -334,8 +331,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/displays/marker/markers/markers_test_fixture.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
       test/rviz_default_plugins/displays/marker/marker_messages.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET marker_test)
       target_include_directories(marker_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(marker_test ${TEST_LINK_LIBRARIES})
@@ -345,8 +341,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/displays/marker/marker_common_test.cpp
       test/rviz_default_plugins/displays/marker/marker_messages.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET marker_common_test)
       target_include_directories(marker_common_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(marker_common_test ${TEST_LINK_LIBRARIES})
@@ -355,8 +350,7 @@ if(BUILD_TESTING)
     ament_add_gmock(map_display_test
       test/rviz_default_plugins/displays/map/map_display_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET map_display_test)
       target_include_directories(map_display_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(map_display_test ${TEST_LINK_LIBRARIES})
@@ -365,8 +359,7 @@ if(BUILD_TESTING)
     ament_add_gmock(measure_tool_test
       test/rviz_default_plugins/tools/measure/measure_tool_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET measure_tool_test)
       target_include_directories(measure_tool_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(measure_tool_test ${TEST_LINK_LIBRARIES})
@@ -375,8 +368,7 @@ if(BUILD_TESTING)
     ament_add_gmock(odometry_display_test
       test/rviz_default_plugins/displays/odometry/odometry_display_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET odometry_display_test)
       target_include_directories(odometry_display_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(odometry_display_test ${TEST_LINK_LIBRARIES})
@@ -393,8 +385,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/view_controllers/orbit/orbit_view_controller_test.cpp
       test/rviz_default_plugins/view_controllers/view_controller_test_fixture.hpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET orbit_view_controller_test)
       target_include_directories(orbit_view_controller_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(orbit_view_controller_test ${TEST_LINK_LIBRARIES})
@@ -404,8 +395,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/view_controllers/ortho/ortho_view_controller_test.cpp
       test/rviz_default_plugins/view_controllers/view_controller_test_fixture.hpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET ortho_view_controller_test)
       target_include_directories(ortho_view_controller_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(ortho_view_controller_test ${TEST_LINK_LIBRARIES})
@@ -421,8 +411,7 @@ if(BUILD_TESTING)
     ament_add_gmock(path_display_test
       test/rviz_default_plugins/displays/path/path_display_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET path_display_test)
       target_include_directories(path_display_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(path_display_test ${TEST_LINK_LIBRARIES})
@@ -431,8 +420,7 @@ if(BUILD_TESTING)
     ament_add_gmock(point_cloud2_display_test
       test/rviz_default_plugins/pointcloud_messages.hpp
       test/rviz_default_plugins/pointcloud_messages.cpp
-      test/rviz_default_plugins/displays/pointcloud/point_cloud2_display_test.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/displays/pointcloud/point_cloud2_display_test.cpp)
     if(TARGET point_cloud2_display_test)
       target_include_directories(point_cloud2_display_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(point_cloud2_display_test ${TEST_LINK_LIBRARIES})
@@ -443,8 +431,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/pointcloud_messages.cpp
       test/rviz_default_plugins/displays/pointcloud/point_cloud_common_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET point_cloud_common_test)
       target_include_directories(point_cloud_common_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(point_cloud_common_test ${TEST_LINK_LIBRARIES})
@@ -458,8 +445,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/displays/pointcloud/point_cloud_transformers/intensity_pc_transformer_test.cpp
       test/rviz_default_plugins/displays/pointcloud/point_cloud_transformers/rgb8_pc_transformer_test.cpp
       test/rviz_default_plugins/displays/pointcloud/point_cloud_transformers/rgbf32_pc_transformer_test.cpp
-      test/rviz_default_plugins/displays/pointcloud/point_cloud_transformers/xyz_pc_transformer_test.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/displays/pointcloud/point_cloud_transformers/xyz_pc_transformer_test.cpp)
     if(TARGET point_cloud_transformers_test)
       target_include_directories(point_cloud_transformers_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(point_cloud_transformers_test ${TEST_LINK_LIBRARIES})
@@ -477,8 +463,7 @@ if(BUILD_TESTING)
     ament_add_gmock(pose_array_display_test
       test/rviz_default_plugins/displays/pose_array/pose_array_display_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET pose_array_display_test)
       target_include_directories(pose_array_display_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(pose_array_display_test ${TEST_LINK_LIBRARIES})
@@ -487,16 +472,14 @@ if(BUILD_TESTING)
     ament_add_gmock(pose_tool_test
       test/rviz_default_plugins/tools/pose/pose_tool_test.cpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET pose_tool_test)
       target_include_directories(pose_tool_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(pose_tool_test ${TEST_LINK_LIBRARIES})
     endif()
 
     ament_add_gmock(robot_test
-      test/rviz_default_plugins/robot/robot_test.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/robot/robot_test.cpp)
     if(TARGET robot_test)
       target_include_directories(robot_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(robot_test ${TEST_LINK_LIBRARIES})
@@ -510,8 +493,7 @@ if(BUILD_TESTING)
     endif()
 
     ament_add_gmock(selection_tool_test
-      test/rviz_default_plugins/tools/select/selection_tool_test.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/tools/select/selection_tool_test.cpp)
     if(TARGET selection_tool_test)
       target_include_directories(selection_tool_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(selection_tool_test ${TEST_LINK_LIBRARIES})
@@ -521,8 +503,7 @@ if(BUILD_TESTING)
       test/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller_test.cpp
       test/rviz_default_plugins/view_controllers/view_controller_test_fixture.hpp
       test/rviz_default_plugins/displays/display_test_fixture.cpp
-      test/rviz_default_plugins/scene_graph_introspection_helper.cpp
-      APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
+      test/rviz_default_plugins/scene_graph_introspection_helper.cpp)
     if(TARGET xy_orbit_view_controller_test)
       target_include_directories(xy_orbit_view_controller_test PUBLIC ${TEST_INCLUDE_DIRS})
       target_link_libraries(xy_orbit_view_controller_test ${TEST_LINK_LIBRARIES})

diff --git a/rviz_visual_testing_framework/CMakeLists.txt b/rviz_visual_testing_framework/CMakeLists.txt
@@ -19,7 +19,7 @@ if(NOT CMAKE_CXX_STANDARD)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic)
+  add_compile_options(-Wall -Wextra -Wpedantic -Werror)
 endif()
 
 find_package(ament_cmake REQUIRED)

diff --git a/rviz_visual_testing_framework/src/visual_test_fixture.cpp b/rviz_visual_testing_framework/src/visual_test_fixture.cpp
@@ -149,7 +149,7 @@ void VisualTestFixture::assertMainWindowIdentity(Ogre::String image_name)
 
 void VisualTestFixture::startApplication()
 {
-  executor_->queueAction([this] {qapp_->quit();});
+  executor_->queueAction([] {qapp_->quit();});
   qapp_->exec();
 }
 

diff --git a/...al_testing_framework/test/reference_images/example_test_with_pointcloud_ref.png b/...al_testing_framework/test/reference_images/example_test_with_pointcloud_ref.png