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

use verbatim on test target to fix testing with ninja #935

Merged
merged 2 commits into from
May 1, 2018
Merged

use verbatim on test target to fix testing with ninja #935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec5bf37
use verbatim on test target to fix ninja test
mikaelarguedas Apr 24, 2018
b7a958f
additional verbatim pointed out by gaschler
mikaelarguedas Apr 26, 2018
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
12 changes: 9 additions & 3 deletions cmake/test/tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ function(catkin_run_tests_target type name xunit_filename)
# for the run_tests target the command needs to return zero so that testing is not aborted
set(cmd ${cmd_wrapper} ${_testing_COMMAND})
add_custom_target(run_tests_${PROJECT_NAME}_${type}_${name}
COMMAND ${cmd})
COMMAND ${cmd}
VERBATIM
)
else()
# create empty dummy target
set(cmd "${CMAKE_COMMAND}" "-E" "echo" "Skipping test target \\'run_tests_${PROJECT_NAME}_${type}_${name}\\'. Enable testing via -DCATKIN_ENABLE_TESTING.")
Expand All @@ -140,13 +142,17 @@ function(catkin_run_tests_target type name xunit_filename)
endif()
# hidden test target which depends on building all tests and cleaning test results
add_custom_target(_run_tests_${PROJECT_NAME}_${type}_${name}
COMMAND ${cmd})
COMMAND ${cmd}
VERBATIM
)
add_dependencies(_run_tests_${PROJECT_NAME}_${type} _run_tests_${PROJECT_NAME}_${type}_${name})

# create target to clean project specific test results
if(NOT TARGET clean_test_results_${PROJECT_NAME})
add_custom_target(clean_test_results_${PROJECT_NAME}
COMMAND ${PYTHON_EXECUTABLE} "${catkin_EXTRAS_DIR}/test/remove_test_results.py" "${CATKIN_TEST_RESULTS_DIR}/${PROJECT_NAME}")
COMMAND ${PYTHON_EXECUTABLE} "${catkin_EXTRAS_DIR}/test/remove_test_results.py" "${CATKIN_TEST_RESULTS_DIR}/${PROJECT_NAME}"
VERBATIM
)
endif()
add_dependencies(_run_tests_${PROJECT_NAME}_${type}_${name} clean_test_results_${PROJECT_NAME} tests ${_testing_DEPENDENCIES})
endfunction()