Skip to content
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

Jump to bottom

Fix another failing test on CentOS 7. #863

Merged
merged 4 commits into from
Dec 1, 2020
Merged

Fix another failing test on CentOS 7. #863

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bae7b6
Fix another failing test on CentOS 7.
clalancette Nov 19, 2020
6775df3
Revert "Fix another failing test on CentOS 7."
clalancette Nov 30, 2020
f7577f5
Skip the test on CentOS.
clalancette Nov 30, 2020
111cb41
Fixes from review.
clalancette Dec 1, 2020
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
39 changes: 31 additions & 8 deletions rcl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,27 @@ set(extra_lib_dirs "${rcl_lib_dir}")
set(test_resources_dir_name "resources")
add_definitions(-DTEST_RESOURCES_DIRECTORY="${CMAKE_CURRENT_BINARY_DIR}/${test_resources_dir_name}")

set(DISTRIBUTION "Unknown")
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
# If we are on Linux, look for /etc/os-release, which has "key=value" items.
# Parse those items, looking for a key named "id" (case-insensitive), and
# if we find it, set DISTRIBUTION to that value. That gives us some idea
# of which Linux distribution we are on.
if(EXISTS "/etc/os-release")
file(STRINGS "/etc/os-release" OS_RELEASE)
foreach(line ${OS_RELEASE})
string(REGEX REPLACE "^(.*)=.*" "\\1" key "${line}")
string(TOLOWER "${key}" key)
if("${key}" STREQUAL "id")
string(REGEX REPLACE "^.*=(.*)" "\\1" DISTRIBUTION "${line}")
hidmic marked this conversation as resolved.
Show resolved Hide resolved
string(TOLOWER "${DISTRIBUTION}" DISTRIBUTION)
message(STATUS "CHRIS: ${DISTRIBUTION}")
clalancette marked this conversation as resolved.
Show resolved Hide resolved
break()
endif()
endforeach()
endif()
endif()

# finding gtest once in the highest scope
# prevents finding it repeatedly in each local scope
ament_find_gtest()
Expand Down Expand Up @@ -162,14 +183,16 @@ function(test_target_function)
AMENT_DEPENDENCIES ${rmw_implementation}
)

rcl_add_custom_gtest(test_node${target_suffix}
SRCS rcl/test_node.cpp
ENV ${rmw_implementation_env_var} ${memory_tools_ld_preload_env_var}
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME} mimick osrf_testing_tools_cpp::memory_tools
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
TIMEOUT 240 # Large timeout to wait for fault injection tests
)
if(NOT "${DISTRIBUTION}" STREQUAL "\"centos\"")
clalancette marked this conversation as resolved.
Show resolved Hide resolved
rcl_add_custom_gtest(test_node${target_suffix}
SRCS rcl/test_node.cpp
ENV ${rmw_implementation_env_var} ${memory_tools_ld_preload_env_var}
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME} mimick osrf_testing_tools_cpp::memory_tools
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
TIMEOUT 240 # Large timeout to wait for fault injection tests
)
endif()

rcl_add_custom_gtest(test_arguments${target_suffix}
SRCS rcl/test_arguments.cpp
Expand Down