Skip to content

Added a new cmake flag to enable isolation #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adityapande-1995 wants to merge 2 commits into
base: rolling
Choose a base branch
from
Draft

Added a new cmake flag to enable isolation #501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6526187
Added a new cmake flag to enable isolation
adityapande-1995 Jan 30, 2024
fb6680f
Reordered args
adityapande-1995 Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ament_cmake_test/cmake/ament_add_test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function(ament_add_test testname)
cmake_parse_arguments(ARG
"GENERATE_RESULT_FOR_RETURN_CODE_ZERO;SKIP_TEST"
"OUTPUT_FILE;RESULT_FILE;RUNNER;SKIP_RETURN_CODE;TIMEOUT;WORKING_DIRECTORY"
"APPEND_ENV;APPEND_LIBRARY_DIRS;COMMAND;ENV"
"APPEND_ENV;APPEND_LIBRARY_DIRS;COMMAND;ENV;ISOLATE_TEST"
Comment thread
adityapande-1995 marked this conversation as resolved.
Outdated
${ARGN})
if(ARG_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "ament_add_test() called with unused arguments: "
Expand Down Expand Up @@ -84,8 +84,13 @@ function(ament_add_test testname)
endif()

get_executable_path(python_interpreter Python3::Interpreter BUILD)
if(ISOLATE_TEST AND UNIX)
set(isolate_test_prefix "{python_interpreter}" "-m" "linux_isolate_process")
else()
set(isolate_test_prefix "")
endif()
# wrap command with run_test script to ensure test result generation
set(cmd_wrapper "${python_interpreter}" "-u" "${ARG_RUNNER}"
set(cmd_wrapper "${isolate_test_prefix}" "${python_interpreter}" "-u" "${ARG_RUNNER}"
Comment thread
adityapande-1995 marked this conversation as resolved.
Outdated
"${ARG_RESULT_FILE}"
"--package-name" "${PROJECT_NAME}")
if(ARG_SKIP_TEST)
Expand Down
1 change: 1 addition & 0 deletions ament_cmake_test/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<buildtool_depend>ament_cmake_python</buildtool_depend>

<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>
<buildtool_export_depend>linux_isolate_process</buildtool_export_depend>

<export>
<build_type>ament_cmake</build_type>
Expand Down