niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23 from ros2/fix_windows_test_running

Browse source 
extend the library path with the location of the memory tools also
This commit is contained in:
William Woodall 2016-02-12 12:21:29 -08:00
commit 02cc077145
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rcl/test/CMakeLists.txt
View file

@ -5,8 +5,9 @@ include(rcl_add_custom_gtest.cmake)
set(extra_test_libraries) set(extra_test_libraries)
set(extra_test_env) set(extra_test_env)
set(extra_lib_dirs "${rcl_lib_dir}")
# This subdirectory extends both extra_test_libraries and extra_test_env. # This subdirectory extends both extra_test_libraries, extra_test_env, and extra_lib_dirs.
add_subdirectory(memory_tools) add_subdirectory(memory_tools)
macro(test_target) macro(test_target)
@ -31,7 +32,7 @@ function(test_target_function)
rcl_add_custom_gtest(test_allocator${target_suffix} rcl_add_custom_gtest(test_allocator${target_suffix}
SRCS rcl/test_allocator.cpp SRCS rcl/test_allocator.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} AMENT_DEPENDENCIES ${rmw_implementation}
) )
@ -39,7 +40,7 @@ function(test_target_function)
rcl_add_custom_gtest(test_time${target_suffix} rcl_add_custom_gtest(test_time${target_suffix}
SRCS rcl/test_time.cpp SRCS rcl/test_time.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} AMENT_DEPENDENCIES ${rmw_implementation}
) )
@ -50,7 +51,7 @@ function(test_target_function)
${extra_test_env} ${extra_test_env}
EMPTY_TEST= EMPTY_TEST=
NORMAL_TEST=foo NORMAL_TEST=foo
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} AMENT_DEPENDENCIES ${rmw_implementation}
) )
@ -58,7 +59,7 @@ function(test_target_function)
rcl_add_custom_gtest(test_rcl${target_suffix} rcl_add_custom_gtest(test_rcl${target_suffix}
SRCS rcl/test_rcl.cpp SRCS rcl/test_rcl.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} AMENT_DEPENDENCIES ${rmw_implementation}
) )
@ -66,7 +67,7 @@ function(test_target_function)
rcl_add_custom_gtest(test_node${target_suffix} rcl_add_custom_gtest(test_node${target_suffix}
SRCS rcl/test_node.cpp SRCS rcl/test_node.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} AMENT_DEPENDENCIES ${rmw_implementation}
) )
@ -74,7 +75,7 @@ function(test_target_function)
rcl_add_custom_gtest(test_publisher${target_suffix} rcl_add_custom_gtest(test_publisher${target_suffix}
SRCS rcl/test_publisher.cpp SRCS rcl/test_publisher.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} "std_msgs" AMENT_DEPENDENCIES ${rmw_implementation} "std_msgs"
) )
@ -82,7 +83,7 @@ function(test_target_function)
rcl_add_custom_gtest(test_subscription${target_suffix} rcl_add_custom_gtest(test_subscription${target_suffix}
SRCS rcl/test_subscription.cpp SRCS rcl/test_subscription.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
APPEND_LIBRARY_DIRS "${rcl_lib_dir}" APPEND_LIBRARY_DIRS ${extra_lib_dirs}
LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries} LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
AMENT_DEPENDENCIES ${rmw_implementation} "std_msgs" AMENT_DEPENDENCIES ${rmw_implementation} "std_msgs"
) )

2
rcl/test/memory_tools/CMakeLists.txt
View file

@ -16,6 +16,7 @@ if(UNIX AND NOT APPLE)
list(APPEND extra_test_libraries dl) list(APPEND extra_test_libraries dl)
list(APPEND extra_test_env DL_PRELOAD=$<TARGET_FILE:${PROJECT_NAME}_memory_tools>) list(APPEND extra_test_env DL_PRELOAD=$<TARGET_FILE:${PROJECT_NAME}_memory_tools>)
endif() endif()
list(APPEND extra_lib_dirs $<TARGET_FILE_DIR:${PROJECT_NAME}_memory_tools>)
target_link_libraries(${PROJECT_NAME}_memory_tools ${extra_test_libraries}) target_link_libraries(${PROJECT_NAME}_memory_tools ${extra_test_libraries})
target_compile_definitions(${PROJECT_NAME}_memory_tools target_compile_definitions(${PROJECT_NAME}_memory_tools
PRIVATE "RCL_MEMORY_TOOLS_BUILDING_DLL") PRIVATE "RCL_MEMORY_TOOLS_BUILDING_DLL")
@ -34,3 +35,4 @@ endif()
set(extra_test_libraries ${extra_test_libraries} PARENT_SCOPE) set(extra_test_libraries ${extra_test_libraries} PARENT_SCOPE)
set(extra_test_env ${extra_test_env} PARENT_SCOPE) set(extra_test_env ${extra_test_env} PARENT_SCOPE)
set(extra_lib_dirs ${extra_lib_dirs} PARENT_SCOPE)