-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge release/omega (4.8.0) branch into master (#236)
<!-- Thanks for the contribution, this is awesome. --> # PR Details This PR is to merge release/omega branch into master branch for C1t release with new version. ## Description <!--- Describe your changes in detail --> ## Related GitHub Issue <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key <!-- e.g. CAR-123 --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
- Loading branch information
Showing
39 changed files
with
1,011 additions
and
661 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| # Copyright 2021 Whitley Software Services, LLC | ||
| # | ||
| # 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. | ||
|
|
||
| # | ||
| # Add a gtest with all found test dependencies. | ||
| # | ||
| # Call add_executable(target ARGN), link it against the gtest libraries | ||
| # and all found test dependencies, and then register the executable as a test. | ||
| # | ||
| # If gtest is not available the specified target is not being created and | ||
| # therefore the target existence should be checked before being used. | ||
| # | ||
| # :param target: the target name which will also be used as the test name | ||
| # :type target: string | ||
| # :param ARGN: the list of source files | ||
| # :type ARGN: list of strings | ||
| # :param RUNNER: the path to the test runner script (default: | ||
| # see ament_add_test). | ||
| # :type RUNNER: string | ||
| # :param TIMEOUT: the test timeout in seconds, | ||
| # default defined by ``ament_add_test()`` | ||
| # :type TIMEOUT: integer | ||
| # :param WORKING_DIRECTORY: the working directory for invoking the | ||
| # executable in, default defined by ``ament_add_test()`` | ||
| # :type WORKING_DIRECTORY: string | ||
| # :param SKIP_LINKING_MAIN_LIBRARIES: if set skip linking against the gtest | ||
| # main libraries | ||
| # :type SKIP_LINKING_MAIN_LIBRARIES: option | ||
| # :param SKIP_TEST: if set mark the test as being skipped | ||
| # :type SKIP_TEST: option | ||
| # :param ENV: list of env vars to set; listed as ``VAR=value`` | ||
| # :type ENV: list of strings | ||
| # :param APPEND_ENV: list of env vars to append if already set, otherwise set; | ||
| # listed as ``VAR=value`` | ||
| # :type APPEND_ENV: list of strings | ||
| # :param APPEND_LIBRARY_DIRS: list of library dirs to append to the appropriate | ||
| # OS specific env var, a la LD_LIBRARY_PATH | ||
| # :type APPEND_LIBRARY_DIRS: list of strings | ||
| # | ||
| # @public | ||
| # | ||
| macro(ament_auto_add_gtest target) | ||
| cmake_parse_arguments(_ARG | ||
| "SKIP_LINKING_MAIN_LIBRARIES;SKIP_TEST" | ||
| "RUNNER;TIMEOUT;WORKING_DIRECTORY" | ||
| "APPEND_ENV;APPEND_LIBRARY_DIRS;ENV" | ||
| ${ARGN}) | ||
| if(NOT _ARG_UNPARSED_ARGUMENTS) | ||
| message(FATAL_ERROR | ||
| "ament_auto_add_gtest() must be invoked with at least one source file") | ||
| endif() | ||
|
|
||
| # add executable | ||
| set(_arg_executable ${_ARG_UNPARSED_ARGUMENTS}) | ||
| if(_ARG_SKIP_LINKING_MAIN_LIBRARIES) | ||
| list(APPEND _arg_executable "SKIP_LINKING_MAIN_LIBRARIES") | ||
| endif() | ||
| ament_add_gtest_executable("${target}" ${_arg_executable}) | ||
|
|
||
| # add include directory of this package if it exists | ||
| if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include") | ||
| target_include_directories("${target}" PUBLIC | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include") | ||
| endif() | ||
|
|
||
| # link against other libraries of this package | ||
| if(NOT ${PROJECT_NAME}_LIBRARIES STREQUAL "") | ||
| target_link_libraries("${target}" ${${PROJECT_NAME}_LIBRARIES}) | ||
| endif() | ||
|
|
||
| # add exported information from found dependencies | ||
| ament_target_dependencies(${target} | ||
| ${${PROJECT_NAME}_FOUND_BUILD_DEPENDS} | ||
| ${${PROJECT_NAME}_FOUND_TEST_DEPENDS} | ||
| ) | ||
|
|
||
| # add test | ||
| set(_arg_test "") | ||
| if(_ARG_RUNNER) | ||
| list(APPEND _arg_test "RUNNER" "${_ARG_RUNNER}") | ||
| endif() | ||
| if(_ARG_TIMEOUT) | ||
| list(APPEND _arg_test "TIMEOUT" "${_ARG_TIMEOUT}") | ||
| endif() | ||
| if(_ARG_WORKING_DIRECTORY) | ||
| list(APPEND _arg_test "WORKING_DIRECTORY" "${_ARG_WORKING_DIRECTORY}") | ||
| endif() | ||
| if(_ARG_SKIP_TEST) | ||
| list(APPEND _arg_test "SKIP_TEST") | ||
| endif() | ||
| if(_ARG_ENV) | ||
| list(APPEND _arg_test "ENV" ${_ARG_ENV}) | ||
| endif() | ||
| if(_ARG_APPEND_ENV) | ||
| list(APPEND _arg_test "APPEND_ENV" ${_ARG_APPEND_ENV}) | ||
| endif() | ||
| if(_ARG_APPEND_LIBRARY_DIRS) | ||
| list(APPEND _arg_test "APPEND_LIBRARY_DIRS" ${_ARG_APPEND_LIBRARY_DIRS}) | ||
| endif() | ||
| ament_add_gtest_test("${target}" ${_arg_test}) | ||
| endmacro() |
41 changes: 41 additions & 0 deletions
41
carma_ros2_utils/cmake/ament_auto_find_test_dependencies.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # Copyright 2021 Whitley Software Services, LLC | ||
| # | ||
| # 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. | ||
|
|
||
| # | ||
| # Invoke find_package() for all test dependencies. | ||
| # | ||
| # All found package names are appended to the | ||
| # ``${PROJECT_NAME}_FOUND_TEST_DEPENDS`` variables. | ||
| # | ||
| # @public | ||
| # | ||
| macro(ament_auto_find_test_dependencies) | ||
| set(_ARGN "${ARGN}") | ||
| if(_ARGN) | ||
| message(FATAL_ERROR "ament_auto_find_test_dependencies() called with " | ||
| "unused arguments: ${_ARGN}") | ||
| endif() | ||
|
|
||
| if(NOT _AMENT_PACKAGE_NAME) | ||
| ament_package_xml() | ||
| endif() | ||
|
|
||
| # try to find_package() all test dependencies | ||
| foreach(_dep ${${PROJECT_NAME}_TEST_DEPENDS}) | ||
| find_package(${_dep} QUIET) | ||
| if(${_dep}_FOUND) | ||
| list(APPEND ${PROJECT_NAME}_FOUND_TEST_DEPENDS ${_dep}) | ||
| endif() | ||
| endforeach() | ||
| endmacro() |
Oops, something went wrong.