From 316d83052f05c7157572c019f86dfa45bdb0b3bd Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 2 Feb 2021 16:34:32 -0800 Subject: [PATCH] Minimal changes to build+test for Foxy Signed-off-by: Emerson Knapp --- .github/workflows/test.yml | 2 +- rosbag2/package.xml | 2 +- .../rosbag2_compression/sequential_compression_reader.cpp | 2 +- rosbag2_cpp/src/rosbag2_cpp/writers/sequential_writer.cpp | 1 + rosbag2_py/COLCON_IGNORE | 0 rosbag2_storage/src/rosbag2_storage/metadata_io.cpp | 7 +------ rosbag2_transport/CMakeLists.txt | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 rosbag2_py/COLCON_IGNORE diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc8298de82..2b9a97e87f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: sqlite3_vendor rosbag2_test_common rosbag2_tests - target-ros2-distro: rolling + target-ros2-distro: foxy - uses: actions/upload-artifact@v1 with: name: colcon-logs diff --git a/rosbag2/package.xml b/rosbag2/package.xml index a64c349feb..a19caae6ba 100644 --- a/rosbag2/package.xml +++ b/rosbag2/package.xml @@ -14,7 +14,7 @@ rosbag2_compression rosbag2_converter_default_plugins rosbag2_cpp - rosbag2_py + rosbag2_storage rosbag2_storage_default_plugins rosbag2_transport diff --git a/rosbag2_compression/src/rosbag2_compression/sequential_compression_reader.cpp b/rosbag2_compression/src/rosbag2_compression/sequential_compression_reader.cpp index 0070322f44..aeb1de54d6 100644 --- a/rosbag2_compression/src/rosbag2_compression/sequential_compression_reader.cpp +++ b/rosbag2_compression/src/rosbag2_compression/sequential_compression_reader.cpp @@ -67,7 +67,7 @@ void SequentialCompressionReader::preprocess_current_file() * Because we have no way to check whether the bag was written correctly, * check for the existence of the prefixed file as a fallback. */ - const rcpputils::fs::path base{base_folder_}; + rcpputils::fs::path base{base_folder_}; const rcpputils::fs::path relative{get_current_file()}; const auto resolved = base / relative; if (!resolved.exists()) { diff --git a/rosbag2_cpp/src/rosbag2_cpp/writers/sequential_writer.cpp b/rosbag2_cpp/src/rosbag2_cpp/writers/sequential_writer.cpp index d0d53e6291..5e65c197b3 100644 --- a/rosbag2_cpp/src/rosbag2_cpp/writers/sequential_writer.cpp +++ b/rosbag2_cpp/src/rosbag2_cpp/writers/sequential_writer.cpp @@ -110,6 +110,7 @@ void SequentialWriter::open( } bool dir_created = rcpputils::fs::create_directories(db_path); + dir_created &= db_path.is_directory(); if (!dir_created) { std::stringstream error; error << "Failed to create database directory (" << db_path.string() << ")."; diff --git a/rosbag2_py/COLCON_IGNORE b/rosbag2_py/COLCON_IGNORE new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rosbag2_storage/src/rosbag2_storage/metadata_io.cpp b/rosbag2_storage/src/rosbag2_storage/metadata_io.cpp index aa81b78fb9..60295edaee 100644 --- a/rosbag2_storage/src/rosbag2_storage/metadata_io.cpp +++ b/rosbag2_storage/src/rosbag2_storage/metadata_io.cpp @@ -232,12 +232,7 @@ BagMetadata MetadataIo::read_metadata(const std::string & uri) YAML::Node yaml_file = YAML::LoadFile(get_metadata_file_name(uri)); auto metadata = yaml_file["rosbag2_bagfile_information"].as(); rcutils_allocator_t allocator = rcutils_get_default_allocator(); - if (RCUTILS_RET_OK != - rcutils_calculate_directory_size(uri.c_str(), &metadata.bag_size, allocator)) - { - throw std::runtime_error( - std::string("Exception on calculating the size of directory :") + uri); - } + metadata.bag_size = rcutils_calculate_directory_size(uri.c_str(), allocator); return metadata; } catch (const YAML::Exception & ex) { throw std::runtime_error(std::string("Exception on parsing info file: ") + ex.what()); diff --git a/rosbag2_transport/CMakeLists.txt b/rosbag2_transport/CMakeLists.txt index de85e96cef..8aa04ead74 100644 --- a/rosbag2_transport/CMakeLists.txt +++ b/rosbag2_transport/CMakeLists.txt @@ -166,7 +166,7 @@ function(create_tests_for_rmw_implementation) rosbag2_transport_add_gmock(test_record_regex test/rosbag2_transport/test_record_regex.cpp LINK_LIBS rosbag2_transport - AMENT_DEPS test_msgs rosbag2_test_common + AMENT_DEPS test_msgs rosbag2_cpp rosbag2_test_common ${SKIP_TEST}) rosbag2_transport_add_gmock(test_play