File tree Expand file tree Collapse file tree 3 files changed +9
-12
lines changed Expand file tree Collapse file tree 3 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -106,8 +106,8 @@ if(BUILD_TESTING)
106
106
# Test XML Schema Validator
107
107
ament_add_gmock (test_validate_xml_schema test /test_validate_xml_schema.cpp )
108
108
target_link_libraries (test_validate_xml_schema
109
- ament_index_cpp::ament_index_cpp
110
- LibXml2::LibXml2
109
+ ament_index_cpp::ament_index_cpp
110
+ LibXml2::LibXml2
111
111
)
112
112
113
113
add_library (test_hardware_components SHARED
@@ -144,11 +144,6 @@ install(
144
144
LIBRARY DESTINATION lib
145
145
)
146
146
147
- install (
148
- DIRECTORY schema urdf
149
- DESTINATION share/hardware_interface
150
- )
151
-
152
147
ament_export_targets (export_hardware_interface HAS_LIBRARY_TARGET )
153
148
ament_export_dependencies (${THIS_PACKAGE_INCLUDE_DEPENDS} )
154
149
ament_package ()
Original file line number Diff line number Diff line change @@ -97,11 +97,13 @@ class XmlSchemaValidationTest : public ::testing::Test
97
97
void SetUp () override
98
98
{
99
99
// Use ament_index_cpp to get the package share directory
100
- std::string package_share_dir =
100
+ std::string urdf_package_share_dir =
101
+ ament_index_cpp::get_package_share_directory (" ros2_control_test_assets" );
102
+ std::string xsd_package_share_dir =
101
103
ament_index_cpp::get_package_share_directory (" hardware_interface" );
102
- valid_xml = package_share_dir + " /urdf/test_hardware_components.urdf" ;
103
- invalid_xml = package_share_dir + " /urdf/test_hardware_components_with_error.urdf" ;
104
- xsd = package_share_dir + " /schema/ros2_control.xsd" ;
104
+ valid_xml = urdf_package_share_dir + " /urdf/test_hardware_components.urdf" ;
105
+ invalid_xml = urdf_package_share_dir + " /urdf/test_hardware_components_with_error.urdf" ;
106
+ xsd = xsd_package_share_dir + " /schema/ros2_control.xsd" ;
105
107
}
106
108
};
107
109
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ install(
15
15
DESTINATION include /ros2_control_test_assets
16
16
)
17
17
install (
18
- FILES urdf/test_hardware_components.urdf
18
+ FILES urdf/test_hardware_components.urdf urdf/test_hardware_components_with_error.urdf
19
19
DESTINATION share/ros2_control_test_assets/urdf
20
20
)
21
21
install (TARGETS ros2_control_test_assets
You can’t perform that action at this time.
0 commit comments