Skip to content

Commit 6a29b34

Browse files
committed
Fix issues in the setup of the test controller that fails on activate
1 parent daa9ce7 commit 6a29b34

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

controller_manager/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ if(BUILD_TESTING)
192192
target_link_libraries(test_release_interfaces
193193
controller_manager
194194
test_controller_with_interfaces
195+
test_controller_failed_activate
195196
ros2_control_test_assets::ros2_control_test_assets
196197
)
197198

controller_manager/test/test_controller_failed_activate/test_controller_failed_activate.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef TEST_CONTROLLER_WITH_INTERFACES__TEST_CONTROLLER_WITH_INTERFACES_HPP_
16-
#define TEST_CONTROLLER_WITH_INTERFACES__TEST_CONTROLLER_WITH_INTERFACES_HPP_
15+
#ifndef TEST_CONTROLLER_FAILED_ACTIVATE__TEST_CONTROLLER_FAILED_ACTIVATE_HPP_
16+
#define TEST_CONTROLLER_FAILED_ACTIVATE__TEST_CONTROLLER_FAILED_ACTIVATE_HPP_
1717

1818
#include <memory>
1919
#include <string>
@@ -72,4 +72,4 @@ class TestControllerFailedActivate : public controller_interface::ControllerInte
7272

7373
} // namespace test_controller_failed_activate
7474

75-
#endif // TEST_CONTROLLER_WITH_INTERFACES__TEST_CONTROLLER_WITH_INTERFACES_HPP_
75+
#endif // TEST_CONTROLLER_FAILED_ACTIVATE__TEST_CONTROLLER_FAILED_ACTIVATE_HPP_

hardware_interface_testing/test/test_components/test_actuator_exclusive_interfaces.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ class TestActuatorExclusiveInterfaces : public ActuatorInterface
147147
{
148148
const auto && [joint_name, interface_name] = extract_joint_and_interface(interface);
149149

150-
// TODO make sure it is not possible to claim multiple interfaces of the same axis
151150
currently_claimed_joints_.push_back(joint_name);
152151
}
153152

0 commit comments

Comments
 (0)