Refine travis check for duplicate includes

This partially reverts commit c36b720d009f1ab1c3900750e05c1f17412e564d.
This commit is contained in:
MarcoFalke 2018-04-10 14:39:22 -04:00 committed by Jack Grigg
parent a3afa2a17e
commit 5747638ecf
1 changed files with 0 additions and 11 deletions

View File

@ -19,17 +19,6 @@ for HEADER_FILE in $(filter_suffix h); do
echo echo
EXIT_CODE=1 EXIT_CODE=1
fi fi
CPP_FILE=${HEADER_FILE/%\.h/.cpp}
if [[ ! -e $CPP_FILE ]]; then
continue
fi
DUPLICATE_INCLUDES_IN_HEADER_AND_CPP_FILES=$(grep -hE "^#include " <(sort -u < "${HEADER_FILE}") <(sort -u < "${CPP_FILE}") | grep -E "^#include " | sort | uniq -d)
if [[ ${DUPLICATE_INCLUDES_IN_HEADER_AND_CPP_FILES} != "" ]]; then
echo "Include(s) from ${HEADER_FILE} duplicated in ${CPP_FILE}:"
echo "${DUPLICATE_INCLUDES_IN_HEADER_AND_CPP_FILES}"
echo
EXIT_CODE=1
fi
done done
for CPP_FILE in $(filter_suffix cpp); do for CPP_FILE in $(filter_suffix cpp); do
DUPLICATE_INCLUDES_IN_CPP_FILE=$(grep -E "^#include " < "${CPP_FILE}" | sort | uniq -d) DUPLICATE_INCLUDES_IN_CPP_FILE=$(grep -E "^#include " < "${CPP_FILE}" | sort | uniq -d)