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

Merge pull request #181 from ros2/ament_cmake_pytest

Browse source 
use ament_cmake_pytest instead of ament_cmake_nose
This commit is contained in:
Dirk Thomas 2017-11-13 17:35:11 -08:00 • committed by GitHub
commit 9aec08caba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rcl/package.xml
View file

@ -28,7 +28,7 @@
<depend>rmw_implementation</depend>
<test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_cmake_nose</test_depend>
<test_depend>ament_cmake_pytest</test_depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
<test_depend>rmw</test_depend>

2
rcl/test/CMakeLists.txt
View file

@ -1,5 +1,5 @@
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_cmake_nose REQUIRED)
find_package(ament_cmake_pytest REQUIRED)
find_package(example_interfaces REQUIRED)
find_package(std_msgs REQUIRED)

2
rcl/test/cmake/rcl_add_custom_launch_test.cmake
View file

@ -32,6 +32,6 @@ macro(rcl_add_custom_launch_test test_name executable1 executable2)
OUTPUT "test/${test_name}${target_suffix}_$<CONFIG>.py"
INPUT "${CMAKE_CURRENT_BINARY_DIR}/${test_name}${target_suffix}.py.configure"
)
ament_add_nose_test(${test_name}${target_suffix} "${CMAKE_CURRENT_BINARY_DIR}/${test_name}${target_suffix}_$<CONFIG>.py" ${ARGN})
ament_add_pytest_test(${test_name}${target_suffix} "${CMAKE_CURRENT_BINARY_DIR}/${test_name}${target_suffix}_$<CONFIG>.py" ${ARGN})
set_tests_properties(${test_name}${target_suffix} PROPERTIES DEPENDS "${executable1}${target_suffix} ${executable2}${target_suffix}")
endmacro()