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)
106106 # Test XML Schema Validator
107107 ament_add_gmock(test_validate_xml_schema test /test_validate_xml_schema.cpp)
108108 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
111111 )
112112
113113 add_library (test_hardware_components SHARED
@@ -144,11 +144,6 @@ install(
144144 LIBRARY DESTINATION lib
145145)
146146
147- install (
148- DIRECTORY schema urdf
149- DESTINATION share/hardware_interface
150- )
151-
152147ament_export_targets(export_hardware_interface HAS_LIBRARY_TARGET)
153148ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS} )
154149ament_package()
Original file line number Diff line number Diff line change @@ -97,11 +97,13 @@ class XmlSchemaValidationTest : public ::testing::Test
9797 void SetUp () override
9898 {
9999 // 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 =
101103 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" ;
105107 }
106108};
107109
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ install(
1515 DESTINATION include /ros2_control_test_assets
1616)
1717install (
18- FILES urdf/test_hardware_components.urdf
18+ FILES urdf/test_hardware_components.urdf urdf/test_hardware_components_with_error.urdf
1919 DESTINATION share/ros2_control_test_assets/urdf
2020)
2121install (TARGETS ros2_control_test_assets
You can’t perform that action at this time.
0 commit comments