Skip to content
Snippets Groups Projects
Commit cb8488ff authored by Zheng Qu's avatar Zheng Qu
Browse files

Merge pull request #110 in SWDEV/franka_ros from clang_scripts_removed to multi_panda_beta

* commit '59c0fbd7':
  removed unneccesary scripts
parents 2680d89d 59c0fbd7
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@ function(add_format_target _target)
add_dependencies(format format-${_target})
add_custom_target(check-format-${_target}
COMMAND scripts/format-check.sh ${CLANG_FORMAT_PROG} -output-replacements-xml ${ARG_FILES}
COMMAND ${CLANG_FORMAT_PROG} -output-replacements-xml ${ARG_FILES} | grep "<replacement " > /dev/null && exit 1 || exit 0
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/..
COMMENT "Checking ${_target} code formatting with clang-format"
VERBATIM
......@@ -55,7 +55,7 @@ function(add_tidy_target _target)
add_dependencies(tidy tidy-${_target})
add_custom_target(check-tidy-${_target}
COMMAND scripts/fail-on-output.sh ${CLANG_TIDY_PROG} -p=${CMAKE_BINARY_DIR} ${ARG_FILES}
COMMAND ${CLANG_TIDY_PROG} -p=${CMAKE_BINARY_DIR} ${ARG_FILES} | grep . && exit 1 || exit 0
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/..
DEPENDS ${ARG_DEPENDS}
COMMENT "Running clang-tidy for ${_target}"
......
#!/usr/bin/env bash
output="$($@)"
if [[ "$output" ]]; then
echo "$output"
exit 1
fi
#!/usr/bin/env bash
# grep the result of clang-format with -output-replacements-xml flag
# if any "replacement" tags are found, then code is incorrectly formatted
echo $($@) | grep '<replacement ' > /dev/null
if [ $? -ne 1 ]; then
echo "Files have to be formatted with clang-format"
exit 1;
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment