Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ros2interface test dependencies on builtin interface #579

Merged
merged 7 commits into from
Jan 20, 2021
Merged

Remove ros2interface test dependencies on builtin interface #579

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f153181
Update tests to avoid using buildin_interfaces
audrow Jun 30, 2020
0a28805
Create ros2cli_test_msgs package with interfaces
audrow Dec 17, 2020
f09c3ee
Update ros2interface show to use ros2cli_test_msgs
audrow Dec 17, 2020
d7fa446
List ros2cli_test_msgs as a test dependency of ros2cli
audrow Dec 17, 2020
7c53031
Change ros2cli_test_msgs to ros2cli_test_interfaces
audrow Dec 19, 2020
3056860
Correct test interfaces dependency in package.xml
audrow Dec 19, 2020
0b1f6cb
Remove ros2cli_test_interfaces from ros2cli test dependencies
audrow Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ros2cli/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<test_depend>ament_pep257</test_depend>
<test_depend>ament_xmllint</test_depend>
<test_depend>python3-pytest</test_depend>
<test_depend>ros2cli_test_interfaces</test_depend>
jacobperron marked this conversation as resolved.
Show resolved Hide resolved
<test_depend>test_msgs</test_depend>

<export>
Expand Down
26 changes: 26 additions & 0 deletions ros2cli_test_interfaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
cmake_minimum_required(VERSION 3.5)
project(ros2cli_test_interfaces)

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

find_package(ament_cmake REQUIRED)
find_package(rosidl_default_generators REQUIRED)

rosidl_generate_interfaces(${PROJECT_NAME}
"action/ShortVariedMultiNested.action"
"msg/ShortVaried.msg"
"msg/ShortVariedMultiNested.msg"
"msg/ShortVariedNested.msg"
"srv/ShortVariedMultiNested.srv"
ADD_LINTER_TESTS
)

ament_export_dependencies(rosidl_default_runtime)

ament_package()
8 changes: 8 additions & 0 deletions ros2cli_test_interfaces/action/ShortVariedMultiNested.action
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Goal definition
ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 2
---
# Result definition
bool bool_value # Comment - Nesting Level 3: 2 of 2
---
# Feedback definition
bool[3] bool_values
8 changes: 8 additions & 0 deletions ros2cli_test_interfaces/msg/ShortVaried.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# A constant
bool BOOL_CONST=true # Comment - Nesting Level 1: 1 of 2

# Bool and array of bools
bool bool_value
bool[<=3] bool_values # Comment - Nesting Level 1: 2 of 2

# Trailing comment
3 changes: 3 additions & 0 deletions ros2cli_test_interfaces/msg/ShortVariedMultiNested.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# A short, varied, and nested type
ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 1
# Trailing comment
3 changes: 3 additions & 0 deletions ros2cli_test_interfaces/msg/ShortVariedNested.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# A short, varied type
ShortVaried short_varied # Comment - Nesting Level 2: 1 of 1
# Trailing comment
27 changes: 27 additions & 0 deletions ros2cli_test_interfaces/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>ros2cli_test_interfaces</name>
<version>1.0.1</version>
<description>A package containing interface definitions for testing ros2cli.</description>
<maintainer email="clairewang@openrobotics.org">Claire Wang</maintainer>
<maintainer email="mabel@openrobotics.org">Mabel Zhang</maintainer>
<license>Apache License 2.0</license>
<author email="audrow@osrfoundation.org">Audrow Nash</author>

<buildtool_depend>ament_cmake</buildtool_depend>

<buildtool_depend>rosidl_default_generators</buildtool_depend>

<depend>action_msgs</depend>

<exec_depend>rosidl_default_runtime</exec_depend>

<test_depend>ament_lint_common</test_depend>

<member_of_group>rosidl_interface_packages</member_of_group>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>
5 changes: 5 additions & 0 deletions ros2cli_test_interfaces/srv/ShortVariedMultiNested.srv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Request
ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 2
---
# Response
bool bool_value # Comment - Nesting Level 3: 2 of 2
1 change: 1 addition & 0 deletions ros2interface/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<test_depend>ament_xmllint</test_depend>
<test_depend>python3-pytest</test_depend>
<test_depend>ros_testing</test_depend>
<test_depend>ros2cli_test_interfaces</test_depend>
<test_depend>test_msgs</test_depend>

<export>
Expand Down
Loading