diff --git a/ament_cmake_ros/ament_cmake_ros-extras.cmake.in b/ament_cmake_ros/ament_cmake_ros-extras.cmake.in index c0b92ba..3c1c5c6 100644 --- 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/ament_cmake_ros_isolated_gtest/cmake/ament_add_ros_isolated_gtest.cmake b/ament_cmake_ros/cmake/ament_add_ros_isolated_gtest.cmake similarity index 93% rename from ament_cmake_ros_isolated_gtest/cmake/ament_add_ros_isolated_gtest.cmake rename to ament_cmake_ros/cmake/ament_add_ros_isolated_gtest.cmake index d6488dc..63c20a5 100644 --- a/ament_cmake_ros_isolated_gtest/cmake/ament_add_ros_isolated_gtest.cmake +++ b/ament_cmake_ros/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/ament_cmake_ros_isolated_pytest/cmake/ament_add_ros_isolated_pytest.cmake b/ament_cmake_ros/cmake/ament_add_ros_isolated_pytest.cmake similarity index 94% rename from ament_cmake_ros_isolated_pytest/cmake/ament_add_ros_isolated_pytest.cmake rename to ament_cmake_ros/cmake/ament_add_ros_isolated_pytest.cmake index c803629..2285458 100644 --- a/ament_cmake_ros_isolated_pytest/cmake/ament_add_ros_isolated_pytest.cmake +++ b/ament_cmake_ros/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/ament_cmake_ros_isolated_test/cmake/run_test_isolated.py b/ament_cmake_ros/cmake/run_test_isolated.py similarity index 100% rename from ament_cmake_ros_isolated_test/cmake/run_test_isolated.py rename to ament_cmake_ros/cmake/run_test_isolated.py diff --git a/ament_cmake_ros/package.xml b/ament_cmake_ros/package.xml index 5c1e5ce..7832fd5 100644 --- a/ament_cmake_ros/package.xml +++ b/ament_cmake_ros/package.xml @@ -8,8 +8,11 @@ Apache License 2.0 ament_cmake + domain_coordinator ament_cmake + ament_cmake_gtest + ament_cmake_pytest ament_lint_auto ament_lint_common diff --git a/ament_cmake_ros_isolated_gtest/CMakeLists.txt b/ament_cmake_ros_isolated_gtest/CMakeLists.txt deleted file mode 100644 index 6f4c2cc..0000000 --- a/ament_cmake_ros_isolated_gtest/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(ament_cmake_ros_isolated_gtest) - -find_package(ament_cmake REQUIRED) - -ament_package( - CONFIG_EXTRAS "ament_cmake_ros_isolated_gtest-extras.cmake" -) - -install( - DIRECTORY cmake - DESTINATION share/${PROJECT_NAME} -) 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 deleted file mode 100644 index ad4216c..0000000 --- a/ament_cmake_ros_isolated_gtest/ament_cmake_ros_isolated_gtest-extras.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2019 Open Source Robotics Foundation, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -find_package(ament_cmake_gtest QUIET REQUIRED) -find_package(ament_cmake_ros_isolated_test REQUIRED) - -include("${ament_cmake_ros_isolated_gtest_DIR}/ament_add_ros_isolated_gtest.cmake") diff --git a/ament_cmake_ros_isolated_gtest/package.xml b/ament_cmake_ros_isolated_gtest/package.xml deleted file mode 100644 index a08f898..0000000 --- a/ament_cmake_ros_isolated_gtest/package.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - ament_cmake_ros_isolated_gtest - 0.7.0 - Adds ability to add gtests isolated with ROS_DOMAIN_ID - Pete Baughman - Apache License 2.0 - - ament_cmake - - ament_cmake_core - ament_cmake_gtest - ament_cmake_ros_isolated_test - - - ament_cmake - - diff --git a/ament_cmake_ros_isolated_pytest/CMakeLists.txt b/ament_cmake_ros_isolated_pytest/CMakeLists.txt deleted file mode 100644 index c647a23..0000000 --- a/ament_cmake_ros_isolated_pytest/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(ament_cmake_ros_isolated_pytest) - -find_package(ament_cmake REQUIRED) - -ament_package( - CONFIG_EXTRAS "ament_cmake_ros_isolated_pytest-extras.cmake" -) - -install( - DIRECTORY cmake - DESTINATION share/${PROJECT_NAME} -) 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 deleted file mode 100644 index d9a41f5..0000000 --- a/ament_cmake_ros_isolated_pytest/ament_cmake_ros_isolated_pytest-extras.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2019 Open Source Robotics Foundation, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -find_package(ament_cmake_pytest QUIET REQUIRED) -find_package(ament_cmake_ros_isolated_test REQUIRED) - -include("${ament_cmake_ros_isolated_pytest_DIR}/ament_add_ros_isolated_pytest.cmake") diff --git a/ament_cmake_ros_isolated_pytest/package.xml b/ament_cmake_ros_isolated_pytest/package.xml deleted file mode 100644 index e0d634a..0000000 --- a/ament_cmake_ros_isolated_pytest/package.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - ament_cmake_ros_isolated_pytest - 0.7.0 - Adds ability to add pytests isolated with ROS_DOMAIN_ID - Pete Baughman - Apache License 2.0 - - ament_cmake - - ament_cmake_core - ament_cmake_pytest - ament_cmake_ros_isolated_test - - - ament_cmake - - diff --git a/ament_cmake_ros_isolated_test/CMakeLists.txt b/ament_cmake_ros_isolated_test/CMakeLists.txt deleted file mode 100644 index 59dd46e..0000000 --- a/ament_cmake_ros_isolated_test/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(ament_cmake_ros_isolated_test) - -find_package(ament_cmake REQUIRED) - -install( - DIRECTORY cmake - DESTINATION share/${PROJECT_NAME} -) - -ament_package() diff --git a/ament_cmake_ros_isolated_test/package.xml b/ament_cmake_ros_isolated_test/package.xml deleted file mode 100644 index c78e4c1..0000000 --- a/ament_cmake_ros_isolated_test/package.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - ament_cmake_ros_isolated_test - 0.7.0 - Provides an alternative test runner to ament_cmake_test that provides ROS_DOMAIN_ID isolation - Pete Baughman - Apache License 2.0 - - ament_cmake - domain_coordinator - - - ament_cmake - - -