Move isolated test functions to ament_cmake_ros

Signed-off-by: Pete Baughman <pete.baughman@apex.ai>
ros2 · Jun 11, 2019 · e1bf0e1 · e1bf0e1
1 parent df25e23
commit e1bf0e1
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 133 deletions.
diff --git a/ament_cmake_ros/ament_cmake_ros-extras.cmake.in b/ament_cmake_ros/ament_cmake_ros-extras.cmake.in
@@ -14,5 +14,10 @@
 
 # generated from ament_cmake_ros/ament_cmake_ros-extras.cmake.in
 
+find_package(ament_cmake_gtest QUIET REQUIRED)
+find_package(ament_cmake_pytest QUIET REQUIRED)
+include("${ament_cmake_ros_DIR}/ament_add_ros_isolated_gtest.cmake")
+include("${ament_cmake_ros_DIR}/ament_add_ros_isolated_pytest.cmake")
+
 include("${ament_cmake_ros_DIR}/build_shared_libs.cmake")
 add_definitions(-DROS_PACKAGE_NAME=\"${PROJECT_NAME}\")
diff --git a/.../cmake/ament_add_ros_isolated_gtest.cmake → .../cmake/ament_add_ros_isolated_gtest.cmake b/.../cmake/ament_add_ros_isolated_gtest.cmake → .../cmake/ament_add_ros_isolated_gtest.cmake
@@ -27,7 +27,7 @@
 
 function(ament_add_ros_isolated_gtest target)
 
-  set(RUNNER "RUNNER" "${ament_cmake_ros_isolated_test_DIR}/run_test_isolated.py")
+  set(RUNNER "RUNNER" "${ament_cmake_ros_DIR}/run_test_isolated.py")
 
   ament_add_gtest(
     "${target}"

diff --git a/...cmake/ament_add_ros_isolated_pytest.cmake → ...cmake/ament_add_ros_isolated_pytest.cmake b/...cmake/ament_add_ros_isolated_pytest.cmake → ...cmake/ament_add_ros_isolated_pytest.cmake
@@ -27,7 +27,7 @@
 
 function(ament_add_ros_isolated_pytest_test testname path)
 
-  set(RUNNER "${ament_cmake_ros_isolated_test_DIR}/run_test_isolated.py")
+  set(RUNNER "${ament_cmake_ros_DIR}/run_test_isolated.py")
 
   ament_add_pytest_test(
     "${testname}" "${path}"

diff --git a/..._isolated_test/cmake/run_test_isolated.py → ament_cmake_ros/cmake/run_test_isolated.py b/..._isolated_test/cmake/run_test_isolated.py → ament_cmake_ros/cmake/run_test_isolated.py
diff --git a/ament_cmake_ros/package.xml b/ament_cmake_ros/package.xml
@@ -8,8 +8,11 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <depend>domain_coordinator</depend>
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
+  <buildtool_export_depend>ament_cmake_gtest</buildtool_export_depend>
+  <buildtool_export_depend>ament_cmake_pytest</buildtool_export_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>

diff --git a/ament_cmake_ros_isolated_gtest/CMakeLists.txt b/ament_cmake_ros_isolated_gtest/CMakeLists.txt
diff --git a/ament_cmake_ros_isolated_gtest/ament_cmake_ros_isolated_gtest-extras.cmake b/ament_cmake_ros_isolated_gtest/ament_cmake_ros_isolated_gtest-extras.cmake
diff --git a/ament_cmake_ros_isolated_gtest/package.xml b/ament_cmake_ros_isolated_gtest/package.xml
diff --git a/ament_cmake_ros_isolated_pytest/CMakeLists.txt b/ament_cmake_ros_isolated_pytest/CMakeLists.txt
diff --git a/ament_cmake_ros_isolated_pytest/ament_cmake_ros_isolated_pytest-extras.cmake b/ament_cmake_ros_isolated_pytest/ament_cmake_ros_isolated_pytest-extras.cmake
diff --git a/ament_cmake_ros_isolated_pytest/package.xml b/ament_cmake_ros_isolated_pytest/package.xml
diff --git a/ament_cmake_ros_isolated_test/CMakeLists.txt b/ament_cmake_ros_isolated_test/CMakeLists.txt
diff --git a/ament_cmake_ros_isolated_test/package.xml b/ament_cmake_ros_isolated_test/package.xml