Skip to content

Commit 4e4ffec

Browse files
committed
Use Uris in ControlBoard tests
1 parent 260310d commit 4e4ffec

8 files changed

+10
-10
lines changed

tests/controlboard/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(TESTS
99
set(_env_vars)
1010
list(APPEND _env_vars "LIBGL_ALWAYS_SOFTWARE=1"
1111
"GZ_SIM_SYSTEM_PLUGIN_PATH=$<TARGET_FILE_DIR:gz-sim-yarp-controlboard-system>"
12-
"GZ_SIM_RESOURCE_PATH=${GZ_SIM_RESOURCE_PATH}:${CMAKE_CURRENT_SOURCE_DIR}/.."
12+
"GZ_SIM_RESOURCE_PATH=${GZ_SIM_RESOURCE_PATH}:${CMAKE_CURRENT_SOURCE_DIR}"
1313
)
1414

1515
foreach(TEST ${TESTS})
@@ -36,5 +36,5 @@ foreach(TEST ${TESTS})
3636

3737
target_compile_definitions(${TEST} PRIVATE CMAKE_CURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
3838

39-
39+
4040
endforeach()

tests/controlboard/coupled_pendulum_two_controlboards.sdf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@
161161

162162
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
163163
<yarpConfigurationFile>
164-
../../../tests/controlboard/conf/gazebo_controlboard.ini
164+
model://conf/gazebo_controlboard.ini
165165
</yarpConfigurationFile>
166166
<initialConfiguration>0.0</initialConfiguration>
167167
</plugin>
168168
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
169169
<yarpConfigurationFile>
170-
../../../tests/controlboard/conf/gazebo_controlboard2.ini
170+
model://conf/gazebo_controlboard2.ini
171171
</yarpConfigurationFile>
172172
<initialConfiguration>0.0</initialConfiguration>
173173
</plugin>

tests/controlboard/coupled_pendulum_two_joints_single_controlboard.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161

162162
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
163163
<yarpConfigurationFile>
164-
../../../tests/controlboard/conf/gazebo_controlboard_multiple_joints.ini
164+
model://conf/gazebo_controlboard_multiple_joints.ini
165165
</yarpConfigurationFile>
166166
<initialConfiguration>0.0</initialConfiguration>
167167
</plugin>

tests/controlboard/pendulum_joint_relative_to_child_link.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
</joint>
139139
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
140140
<yarpConfigurationFile>
141-
../../../tests/controlboard/conf/gazebo_controlboard.ini
141+
model://conf/gazebo_controlboard.ini
142142
</yarpConfigurationFile>
143143
<initialConfiguration>0.0</initialConfiguration>
144144
</plugin>

tests/controlboard/pendulum_joint_relative_to_parent_link.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</link>
135135
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
136136
<yarpConfigurationFile>
137-
../../../tests/controlboard/conf/gazebo_controlboard.ini
137+
model://conf/gazebo_controlboard.ini
138138
</yarpConfigurationFile>
139139
<initialConfiguration>0.0</initialConfiguration>
140140
</plugin>

tests/controlboard/pendulum_multiple_gz_instances.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135

136136
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
137137
<yarpConfigurationFile>
138-
../../../tests/controlboard/conf/gazebo_controlboard_multiple_instances.ini
138+
model://conf/gazebo_controlboard_multiple_instances.ini
139139
</yarpConfigurationFile>
140140
<initialConfiguration>0.0</initialConfiguration>
141141
</plugin>

tests/controlboard/pendulum_no_initial_configuration.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</link>
135135
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
136136
<yarpConfigurationFile>
137-
../../../tests/controlboard/conf/gazebo_controlboard.ini
137+
model://conf/gazebo_controlboard.ini
138138
</yarpConfigurationFile>
139139
</plugin>
140140
</model>

tests/controlboard/pendulum_with_initial_configuration.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</link>
135135
<plugin name="gzyarp::ControlBoard" filename="gz-sim-yarp-controlboard-system">
136136
<yarpConfigurationFile>
137-
../../../tests/controlboard/conf/gazebo_controlboard.ini
137+
model://conf/gazebo_controlboard.ini
138138
</yarpConfigurationFile>
139139
<initialConfiguration>0.0 90.0</initialConfiguration>
140140
</plugin>

0 commit comments

Comments
 (0)