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

Release fix ups #71

Merged
merged 4 commits into from
Dec 12, 2018
Merged

Release fix ups #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0260c4e
fix unused variable warning when in release
Karsten1987 Dec 12, 2018
111cb72
update maintainer email
Karsten1987 Dec 12, 2018
24aeabe
depend on sqlite3 in vendor package
Karsten1987 Dec 12, 2018
ae1c0e2
do not ignore return values
Karsten1987 Dec 12, 2018
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
2 changes: 1 addition & 1 deletion ros2bag/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<description>
Entry point for rosbag in ROS 2
</description>
<maintainer email="karsten@osrfoundation.org">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<depend>ros2cli</depend>
Expand Down
2 changes: 1 addition & 1 deletion rosbag2/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>rosbag2</name>
<version>0.0.1</version>
<description>ROSBag2 client library</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_converter_default_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>rosbag2_converter_default_plugins</name>
<version>0.0.1</version>
<description>Package containing default plugins for format converters</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_storage/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>rosbag2_storage</name>
<version>0.0.1</version>
<description>ROS2 independent storage format to store serialized ROS2 messages</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_storage_default_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>rosbag2_storage_default_plugins</name>
<version>0.0.1</version>
<description>ROSBag2 SQLite3 storage plugin</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
1 change: 1 addition & 0 deletions ...rage_default_plugins/test/rosbag2_storage_default_plugins/sqlite/storage_test_fixture.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class StorageTestFixture : public TemporaryDirectoryFixture
serialized_data->buffer, serialized_data->buffer_capacity, message);

assert(written_size == message_size - 1); // terminated null character not counted
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: replacing this assert with ASSERT_THAT or similar is probably the better option.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does ASSERT_THAT overcome the unused warning ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, other than assert it does not "vanish" in a release mode build.

(void) written_size;
return serialized_data;
}

Expand Down
2 changes: 1 addition & 1 deletion rosbag2_test_common/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>rosbag2_test_common</name>
<version>0.0.1</version>
<description>Commonly used test helper classes and fixtures for rosbag2</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_tests/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>rosbag2_tests</name>
<version>0.0.1</version>
<description>Tests package for rosbag2</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
15 changes: 12 additions & 3 deletions rosbag2_tests/test/rosbag2_tests/process_execution_helpers_unix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,20 @@ using ProcessHandle = int;
int execute_and_wait_until_completion(const std::string & command, const std::string & path)
{
char previous_dir[PATH_MAX];
getcwd(previous_dir, PATH_MAX);
auto ret_get_cwd = getcwd(previous_dir, PATH_MAX);
if (ret_get_cwd == NULL) {
return EXIT_FAILURE;
}

chdir(path.c_str());
auto ret_ch_dir = chdir(path.c_str());
if (ret_ch_dir != 0) {
return EXIT_FAILURE;
}
auto exitcode = std::system(command.c_str());
chdir(previous_dir);
ret_ch_dir = chdir(previous_dir);
if (ret_ch_dir != 0) {
return EXIT_FAILURE;
}

return WEXITSTATUS(exitcode);
}
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_transport/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>rosbag2_transport</name>
<version>0.0.1</version>
<description>Layer encapsulating ROS middleware to allow rosbag2 to be used with or without middleware</description>
<maintainer email="karsten.knese@googlemail.com">karsten</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_ros</buildtool_depend>
Expand Down
2 changes: 1 addition & 1 deletion shared_queues_vendor/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>shared_queues_vendor</name>
<version>0.0.1</version>
<description>Vendor package for concurrent queues from moodycamel</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
4 changes: 3 additions & 1 deletion sqlite3_vendor/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
<name>sqlite3_vendor</name>
<version>0.0.1</version>
<description>SQLite 3 vendor package</description>
<maintainer email="karsten.knese@googlemail.com">Karsten Knese</maintainer>
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>cmake</buildtool_depend>

<depend>libsqlite3-dev</depend>

<export>
<build_type>cmake</build_type>
</export>
Expand Down