wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make lint checker script more robust 

llvm-svn: 189479
This commit is contained in:
Alexey Samsonov 2013-08-28 12:15:03 +00:00
parent ce09d07824
commit dd1d1b2c79
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler-rt/lib/sanitizer_common/CMakeLists.txt
View File

@ -104,7 +104,8 @@ endif()
if(UNIX) if(UNIX)
set(SANITIZER_LINT_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_lint.sh) set(SANITIZER_LINT_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_lint.sh)
add_custom_target(SanitizerLintCheck ALL add_custom_target(SanitizerLintCheck ALL
COMMAND LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 ${SANITIZER_LINT_SCRIPT} COMMAND LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 TMPDIR=
${SANITIZER_LINT_SCRIPT}
DEPENDS ${SANITIZER_LINT_SCRIPT} DEPENDS ${SANITIZER_LINT_SCRIPT}
COMMENT "Running lint check for sanitizer sources..." COMMENT "Running lint check for sanitizer sources..."
VERBATIM) VERBATIM)

7
compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
View File

@ -31,12 +31,12 @@ SANITIZER_INCLUDES_LINT_FILTER=${COMMON_LINT_FILTER},-runtime/int
cd ${LLVM_CHECKOUT} cd ${LLVM_CHECKOUT}
EXITSTATUS=0 EXITSTATUS=0
LOG=$(mktemp) LOG=$(mktemp -q)
run_lint() { run_lint() {
FILTER=$1 FILTER=$1
shift shift
if [ "${SILENT}" == "1" ]; then if [[ "${SILENT}" == "1" && "${LOG}" != "" ]]; then
${CPPLINT} --filter=${FILTER} "$@" 2>>$LOG ${CPPLINT} --filter=${FILTER} "$@" 2>>$LOG
else else
${CPPLINT} --filter=${FILTER} "$@" ${CPPLINT} --filter=${FILTER} "$@"
@ -97,7 +97,8 @@ for FILE in $FILES; do
done done
if [ "$EXITSTATUS" != "0" ]; then if [ "$EXITSTATUS" != "0" ]; then
cat $LOG | grep -v "Done processing" | grep -v "Total errors found" cat $LOG | grep -v "Done processing" | grep -v "Total errors found" \
grep -v "Skipping input"
fi fi
exit $EXITSTATUS exit $EXITSTATUS