Skip to content

Commit

Permalink
Fix melodic compiler warnings (#744)
Browse files Browse the repository at this point in the history
* Fix model_state_test. -v means --version not --verbose (#710)

* fix gazebo9 warnings by removing Set.*Accel calls (#728)

* fix gazebo9 warnings by removing Set.*Accel calls

* gazebo_plugins: don't use -r in tests
  • Loading branch information
kev-the-dev authored and j-rivero committed Jun 8, 2018
1 parent 1d4de71 commit cd23e3a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
4 changes: 0 additions & 4 deletions gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,9 @@ void GazeboRosVacuumGripper::UpdateChild()
double norm = diff.Pos().Length();
if (norm < 0.05) {
#if GAZEBO_MAJOR_VERSION >= 8
links[j]->SetLinearAccel(link_->WorldLinearAccel());
links[j]->SetAngularAccel(link_->WorldAngularAccel());
links[j]->SetLinearVel(link_->WorldLinearVel());
links[j]->SetAngularVel(link_->WorldAngularVel());
#else
links[j]->SetLinearAccel(link_->GetWorldLinearAccel());
links[j]->SetAngularAccel(link_->GetWorldAngularAccel());
links[j]->SetLinearVel(link_->GetWorldLinearVel());
links[j]->SetAngularVel(link_->GetWorldAngularVel());
#endif
Expand Down
2 changes: 1 addition & 1 deletion gazebo_plugins/test/camera/camera.test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<node name="gazebo" pkg="gazebo_ros" type="gzserver"
respawn="false" output="screen"
args="-r $(find gazebo_plugins)/test/camera/camera.world" />
args="--verbose $(find gazebo_plugins)/test/camera/camera.world" />

<group if="$(arg gui)">
<node name="gazebo_gui" pkg="gazebo_ros" type="gzclient" respawn="false" output="screen"/>
Expand Down
2 changes: 1 addition & 1 deletion gazebo_plugins/test/camera/depth_camera.test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<node name="gazebo" pkg="gazebo_ros" type="gzserver"
respawn="false" output="screen"
args="-r $(find gazebo_plugins)/test/camera/depth_camera.world" />
args="--verbose $(find gazebo_plugins)/test/camera/depth_camera.world" />

<group if="$(arg gui)">
<node name="gazebo_gui" pkg="gazebo_ros" type="gzclient" respawn="false" output="screen"/>
Expand Down
2 changes: 1 addition & 1 deletion gazebo_plugins/test/camera/multicamera.test
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<node name="gazebo" pkg="gazebo_ros" type="gzserver"
respawn="false" output="screen"
args="-r $(find gazebo_plugins)/test/camera/multicamera.world" />
args="--verbose $(find gazebo_plugins)/test/camera/multicamera.world" />

<test test-name="multicamera" pkg="gazebo_plugins" type="multicamera-test"
clear_params="true" time-limit="15.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<!-- Launch file for ekf_localization_node_test-interfaces -->

<launch>

<param name="/use_sim_time" value="true" />

<!-- gazebo server-->
<node name="gazebo" pkg="gazebo_ros" type="gzserver" respawn="false" output="screen" args="-r $(find gazebo_plugins)/test/set_model_state_test/set_model_state_test_p2dx.world" />
<node name="gazebo" pkg="gazebo_ros" type="gzserver" respawn="false" output="screen"
args="--verbose $(find gazebo_plugins)/test/set_model_state_test/set_model_state_test_p2dx.world" />

<test test-name="set_model_state_test" pkg="gazebo_plugins" type="set_model_state-test" clear_params="true" time-limit="100.0" />

</launch>

0 comments on commit cd23e3a

Please sign in to comment.