remove rcpputils and rcutils dependency (#61)

Signed-off-by: Kenta Yonekura <[email protected]>
ros2 · Oct 6, 2023 · 6a42ed6 · 6a42ed6
1 parent 4dbe69b
commit 6a42ed6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,6 @@ if(BUILD_TESTING)
   ament_lint_cmake("--filter=-convention/filename,-package/stdargs")
 
   find_package(ament_cmake_gtest REQUIRED)
-  find_package(rcpputils REQUIRED)
   find_package(performance_test_fixture REQUIRED)
   # Give cppcheck hints about macro definitions coming from outside this package
   get_target_property(ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS
@@ -57,14 +56,12 @@ if(BUILD_TESTING)
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
   if(TARGET test_yaml_reader)
     target_link_libraries(test_yaml_reader yaml_library)
-    ament_target_dependencies(test_yaml_reader rcpputils)
   endif()
 
   add_performance_test(benchmark_reader test/benchmark/benchmark_reader.cpp
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
   if(TARGET benchmark_reader)
     target_link_libraries(benchmark_reader yaml_library)
-    ament_target_dependencies(benchmark_reader rcpputils)
   endif()
 endif()
 

diff --git a/package.xml b/package.xml
@@ -34,8 +34,6 @@
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>performance_test_fixture</test_depend>
-  <test_depend>rcpputils</test_depend>
-  <test_depend>rcutils</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>

diff --git a/test/benchmark/benchmark_reader.cpp b/test/benchmark/benchmark_reader.cpp
@@ -18,10 +18,9 @@
 
 #include <yaml.h>
 
+#include <filesystem>
 #include <string>
 
-#include "rcpputils/filesystem_helper.hpp"
-
 #include "performance_test_fixture/performance_test_fixture.hpp"
 
 using performance_test_fixture::PerformanceTest;
@@ -52,7 +51,8 @@ BENCHMARK_F(PerformanceTest, yaml_parser_set_input_string)(benchmark::State & st
 BENCHMARK_F(PerformanceTest, yaml_parser_set_input_file)(benchmark::State & st)
 {
   std::string path =
-    (rcpputils::fs::current_path() / "test" / "benchmark" / "benchmark_params.yaml").string();
+    (std::filesystem::current_path() / "test" / "benchmark" /
+    "benchmark_params.yaml").generic_string();
 
   yaml_parser_t parser;
   FILE * pFile;
@@ -73,7 +73,8 @@ BENCHMARK_F(PerformanceTest, yaml_parser_set_input_file)(benchmark::State & st)
 BENCHMARK_F(PerformanceTest, yaml_parser_set_input_file_event)(benchmark::State & st)
 {
   std::string path =
-    (rcpputils::fs::current_path() / "test" / "benchmark" / "benchmark_params.yaml").string();
+    (std::filesystem::current_path() / "test" / "benchmark" /
+    "benchmark_params.yaml").generic_string();
 
   yaml_parser_t parser;
   FILE * pFile;

diff --git a/test/test_reader.cpp b/test/test_reader.cpp
@@ -20,15 +20,14 @@
 #include <gtest/gtest.h>
 #include <yaml.h>
 
+#include <filesystem>
 #include <string>
 
-#include "rcpputils/filesystem_helper.hpp"
-#include "rcutils/filesystem.h"
-
 TEST(test_libyaml, yaml_read_file)
 {
   std::string path =
-    (rcpputils::fs::current_path() / "test" / "benchmark" / "benchmark_params.yaml").string();
+    (std::filesystem::current_path() / "test" / "benchmark" /
+    "benchmark_params.yaml").generic_string();
 
   yaml_parser_t parser;
   yaml_event_t event;
@@ -46,7 +45,8 @@ TEST(test_libyaml, yaml_read_file)
 TEST(test_libyaml, yaml_read_file_fails)
 {
   std::string path =
-    (rcpputils::fs::current_path() / "test" / "benchmark" / "benchmark_params.yaml").string();
+    (std::filesystem::current_path() / "test" / "benchmark" /
+    "benchmark_params.yaml").generic_string();
 
   yaml_parser_t parser;
   yaml_event_t event;