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

Only build and run tracing tests if LTTng is enabled and found

Browse source
This commit is contained in:
Christophe Bedard 2019-07-12 10:06:52 +02:00
parent 05863a35c6
commit 3542aab984
3 changed files with 43 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
colcon.meta
View file

@ -5,5 +5,10 @@
"-DWITH_LTTNG=ON", "-DWITH_LTTNG=ON",
], ],
}, },
"tracetools_test": {
"cmake-args": [
"-DWITH_LTTNG=ON",
],
},
}, },
} }

9
tracetools/CMakeLists.txt
View file

@ -91,9 +91,12 @@ if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED) find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies() ament_lint_auto_find_test_dependencies()
ament_add_gtest(test_utils test/test_utils.cpp) # Only build tracetools utils tests if LTTng is enabled and found
if(TARGET test_utils) if(TRACETOOLS_LTTNG_ENABLED)
target_link_libraries(test_utils ${PROJECT_NAME} -rdynamic) ament_add_gtest(test_utils test/test_utils.cpp)
if(TARGET test_utils)
target_link_libraries(test_utils ${PROJECT_NAME} -rdynamic)
endif()
endif() endif()
endif() endif()

53
tracetools_test/CMakeLists.txt
View file

@ -12,6 +12,8 @@ endif()
find_package(ament_cmake REQUIRED) find_package(ament_cmake REQUIRED)
option(WITH_LTTNG "Include support for tracing with LTTng" OFF)
# Tests # Tests
if(BUILD_TESTING) if(BUILD_TESTING)
find_package(rclcpp REQUIRED) find_package(rclcpp REQUIRED)
@ -116,29 +118,38 @@ if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED) find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies() ament_lint_auto_find_test_dependencies()
find_package(ament_cmake_pytest REQUIRED) # Only build tracing tests if LTTng is enabled and found
if(WITH_LTTNG)
find_package(PkgConfig REQUIRED)
pkg_check_modules(LTTNG REQUIRED lttng-ust)
if(LTTNG_FOUND)
message("LTTng found: tracing tests enabled")
# Run each test in its own pytest invocation find_package(ament_cmake_pytest REQUIRED)
set(_tracetools_test_pytest_tests
test/test_intra.py
test/test_node.py
test/test_publisher.py
test/test_service.py
test/test_service_callback.py
test/test_subscription.py
test/test_subscription_callback.py
test/test_timer.py
)
foreach(_test_path ${_tracetools_test_pytest_tests}) # Run each test in its own pytest invocation
get_filename_component(_test_name ${_test_path} NAME_WE) set(_tracetools_test_pytest_tests
ament_add_pytest_test(${_test_name} ${_test_path} test/test_intra.py
PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}" test/test_node.py
APPEND_ENV AMENT_PREFIX_PATH=${ament_index_build_path} test/test_publisher.py
PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR} test/test_service.py
TIMEOUT 60 test/test_service_callback.py
) test/test_subscription.py
endforeach() test/test_subscription_callback.py
test/test_timer.py
)
foreach(_test_path ${_tracetools_test_pytest_tests})
get_filename_component(_test_name ${_test_path} NAME_WE)
ament_add_pytest_test(${_test_name} ${_test_path}
PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}"
APPEND_ENV AMENT_PREFIX_PATH=${ament_index_build_path}
PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 60
)
endforeach()
endif()
endif()
endif() endif()
ament_package() ament_package()